diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 01:45:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 01:54:30 +0200 |
| commit | 0ebcf878032fa32a02e406a3397b51dc8b45109d (patch) | |
| tree | 3d668f67a461aaf3494030c942d17a19cad75db0 | |
| parent | 5b58692ed4a711d431e0073d6853cf8210ebb5a6 (diff) | |
| download | ffmpeg-0ebcf878032fa32a02e406a3397b51dc8b45109d.tar.gz | |
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches
Should fix build failure on MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/lavfi.c | 5 | ||||
| -rw-r--r-- | libavutil/bprint.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 9be2d0e724..f96fe8352c 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -27,7 +27,6 @@ #include <float.h> /* DBL_MIN, DBL_MAX */ #include <fcntl.h> /* O_RDONLY */ -#include <unistd.h> /* close() */ #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" @@ -43,6 +42,10 @@ #include "libavformat/internal.h" #include "avdevice.h" +#if HAVE_UNISTD_H +#include <unistd.h> /* close() */ +#endif + typedef struct { AVClass *class; ///< class for private options char *graph_str; diff --git a/libavutil/bprint.c b/libavutil/bprint.c index becb4d8013..4fd902ef74 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <string.h> #include <time.h> -#include <unistd.h> #include "avassert.h" #include "avstring.h" #include "bprint.h" @@ -31,6 +30,11 @@ #include "error.h" #include "mem.h" +#if HAVE_UNISTD_H +#include <unistd.h> +#endif + + #define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size)) #define av_bprint_is_allocated(buf) ((buf)->str != (buf)->reserved_internal_buffer) |