diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gst/udp/gstdynudpsink.c | 12 | ||||
| -rw-r--r-- | gst/udp/gstdynudpsink.h | 10 | ||||
| -rw-r--r-- | gst/udp/gstmultiudpsink.c | 8 | ||||
| -rw-r--r-- | gst/udp/gstmultiudpsink.h | 6 | ||||
| -rw-r--r-- | gst/udp/gstudpsink.c | 8 | ||||
| -rw-r--r-- | gst/udp/gstudpsink.h | 6 | ||||
| -rw-r--r-- | gst/udp/gstudpsrc.c | 10 |
9 files changed, 55 insertions, 24 deletions
@@ -1,3 +1,19 @@ +2007-11-02 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com> + + * configure.ac: + * gst/udp/gstdynudpsink.c: + * gst/udp/gstdynudpsink.h: + * gst/udp/gstmultiudpsink.c: + * gst/udp/gstmultiudpsink.h: + * gst/udp/gstudpsink.c: + * gst/udp/gstudpsink.h: + Fix includes for MSVC and GLib-2.14.0 (#492388). + + * gst/udp/gstudpsrc.c: (gst_udpsrc_start): + No more pipe define since GLib-2.14.0, need to use _pipe() directly. + 2007-11-02 Edward Hervey <bilboed@bilboed.com> * gst/law/mulaw-decode.c: (mulawdec_sink_setcaps), diff --git a/configure.ac b/configure.ac index ba321edb..feec39a8 100644 --- a/configure.ac +++ b/configure.ac @@ -198,6 +198,9 @@ AC_CHECK_HEADERS([netinet/in.h]) AC_CHECK_HEADERS([winsock2.h]) AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes") +dnl used in gst/udp +AC_CHECK_HEADERS([sys/time.h]) + dnl *** checks for types/defines *** dnl Check for FIONREAD ioctl declaration. This check is needed diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index 59b323de..02d52b2f 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -24,6 +24,18 @@ #endif #include "gstudp-marshal.h" #include "gstdynudpsink.h" + +#include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <errno.h> +#include <string.h> +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#include <sys/types.h> #include <gst/netbuffer/gstnetbuffer.h> GST_DEBUG_CATEGORY_STATIC (dynudpsink_debug); diff --git a/gst/udp/gstdynudpsink.h b/gst/udp/gstdynudpsink.h index f912b8a2..d46dfdf0 100644 --- a/gst/udp/gstdynudpsink.h +++ b/gst/udp/gstdynudpsink.h @@ -25,16 +25,6 @@ G_BEGIN_DECLS -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <errno.h> -#include <string.h> -#ifndef G_OS_WIN32 -#include <sys/time.h> -#endif -#include <sys/types.h> - #include "gstudpnetutils.h" #include "gstudp.h" diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index a30ca543..ae96dbb0 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -36,6 +36,14 @@ #include "gstudp-marshal.h" #include "gstmultiudpsink.h" +#include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <errno.h> +#include <string.h> + GST_DEBUG_CATEGORY_STATIC (multiudpsink_debug); #define GST_CAT_DEFAULT (multiudpsink_debug) diff --git a/gst/udp/gstmultiudpsink.h b/gst/udp/gstmultiudpsink.h index 94bc5ef7..52ab296b 100644 --- a/gst/udp/gstmultiudpsink.h +++ b/gst/udp/gstmultiudpsink.h @@ -25,12 +25,6 @@ G_BEGIN_DECLS -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <errno.h> -#include <string.h> - #include "gstudpnetutils.h" #include "gstudp.h" diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c index 78386062..62db3308 100644 --- a/gst/udp/gstudpsink.c +++ b/gst/udp/gstudpsink.c @@ -22,6 +22,14 @@ #endif #include "gstudpsink.h" +#include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#include <errno.h> +#include <string.h> + #define UDP_DEFAULT_HOST "localhost" #define UDP_DEFAULT_PORT 4951 diff --git a/gst/udp/gstudpsink.h b/gst/udp/gstudpsink.h index f6d95e97..17f55525 100644 --- a/gst/udp/gstudpsink.h +++ b/gst/udp/gstudpsink.h @@ -26,12 +26,6 @@ G_BEGIN_DECLS -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <errno.h> -#include <string.h> - #include "gstudp.h" #include "gstudpnetutils.h" diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index d547fea1..8964f837 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -120,9 +120,15 @@ #endif #include "gstudpsrc.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <stdlib.h> +#if defined _MSC_VER && (_MSC_VER >= 1400) +#include <io.h> +#endif + #include <gst/netbuffer/gstnetbuffer.h> #ifdef G_OS_WIN32 typedef int socklen_t; @@ -711,8 +717,8 @@ gst_udpsrc_start (GstBaseSrc * bsrc) GST_DEBUG_OBJECT (src, "creating pipe"); /* This should work on UNIX too. PF_UNIX sockets replaced with pipe */ - /* pipe( CONTROL_SOCKETS(src) ) */ - if ((ret = pipe (CONTROL_SOCKETS (src))) < 0) + /* pipe( CONTROL_SOCKETS(src), 4096, _O_BINARY ) */ + if ((ret = _pipe (CONTROL_SOCKETS (src), 4096, _O_BINARY)) < 0) goto no_socket_pair; #else GST_DEBUG_OBJECT (src, "creating socket pair"); |