From 0ebcf878032fa32a02e406a3397b51dc8b45109d Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 8 Jul 2014 01:45:43 +0200
Subject: [PATCH] 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>
---
libavdevice/lavfi.c | 5 ++++-
libavutil/bprint.c | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index 9be2d0e7244..f96fe8352c2 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 becb4d80135..4fd902ef74c 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)
--
GitLab