summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2008-03-02 18:32:36 +0000
committerTim-Philipp Müller <tim@centricular.net>2008-03-02 18:32:36 +0000
commitd85688b8a2202149536001786e5bd32a9a89fc8f (patch)
tree887f20ddeb4ec70fd29e6ab754712dd5cf6dd237
parentf82c6ab4f48285cf46ae2cfeb94d13a9e49504a4 (diff)
downloadgstreamer-plugins-base-d85688b8a2202149536001786e5bd32a9a89fc8f.tar.gz
gst-libs/gst/rtsp/gstrtspconnection.c: Don't include unix headers unconditionally (fixes #518037).
Original commit message from CVS: * gst-libs/gst/rtsp/gstrtspconnection.c: Don't include unix headers unconditionally (fixes #518037).
-rw-r--r--ChangeLog5
-rw-r--r--gst-libs/gst/rtsp/gstrtspconnection.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b4b60ab21..6c3324ff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-02 Tim-Philipp Müller <tim at centricular dot net>
+ * gst-libs/gst/rtsp/gstrtspconnection.c:
+ Don't include unix headers unconditionally (fixes #518037).
+
+2008-03-02 Tim-Philipp Müller <tim at centricular dot net>
+
* tests/check/libs/video.c: (paintinfo), (paintinfo_struct),
(fourcc_list_struct), (fourcc_list), (fourcc_get_size),
(paint_setup_I420), (paint_setup_YV12), (paint_setup_AYUV),
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index ede92728f..c2a2f0d7e 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -61,12 +61,14 @@
#include <stdio.h>
#include <errno.h>
-#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <fcntl.h>
#include <time.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
/* we include this here to get the G_OS_* defines */
#include <glib.h>
@@ -81,6 +83,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <fcntl.h>
#endif
#ifdef HAVE_FIONREAD_IN_SYS_FILIO