From: <tp...@ke...> - 2008-03-02 18:32:45
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: tpm Date: Sun Mar 02 2008 18:32:50 UTC Log message: * gst-libs/gst/rtsp/gstrtspconnection.c: Don't include unix headers unconditionally (fixes #518037). Modified files: . : ChangeLog gst-libs/gst/rtsp: gstrtspconnection.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3789&r2=1.3790 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.c.diff?r1=1.13&r2=1.14 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3789 retrieving revision 1.3790 diff -u -d -r1.3789 -r1.3790 --- ChangeLog 2 Mar 2008 18:24:35 -0000 1.3789 +++ ChangeLog 2 Mar 2008 18:32:34 -0000 1.3790 @@ -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), Index: gstrtspconnection.c RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtsp/gstrtspconnection.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gstrtspconnection.c 28 Feb 2008 09:50:52 -0000 1.13 +++ gstrtspconnection.c 2 Mar 2008 18:32:36 -0000 1.14 @@ -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 |