generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches

Browse Source 
Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-08 01:45:43 +02:00
parent 5b58692ed4
commit 0ebcf87803
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/lavfi.c
View File

@ -27,7 +27,6 @@
#include <float.h> /* DBL_MIN, DBL_MAX */ #include <float.h> /* DBL_MIN, DBL_MAX */
#include <fcntl.h> /* O_RDONLY */ #include <fcntl.h> /* O_RDONLY */
#include <unistd.h> /* close() */
#include "libavutil/bprint.h" #include "libavutil/bprint.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
@ -43,6 +42,10 @@
#include "libavformat/internal.h" #include "libavformat/internal.h"
#include "avdevice.h" #include "avdevice.h"
#if HAVE_UNISTD_H
#include <unistd.h> /* close() */
#endif
typedef struct { typedef struct {
AVClass *class; ///< class for private options AVClass *class; ///< class for private options
char *graph_str; char *graph_str;

6
libavutil/bprint.c
View File

@ -22,7 +22,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h>
#include "avassert.h" #include "avassert.h"
#include "avstring.h" #include "avstring.h"
#include "bprint.h" #include "bprint.h"
@ -31,6 +30,11 @@
#include "error.h" #include "error.h"
#include "mem.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_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size))
#define av_bprint_is_allocated(buf) ((buf)->str != (buf)->reserved_internal_buffer) #define av_bprint_is_allocated(buf) ((buf)->str != (buf)->reserved_internal_buffer)