From 9c8ea35617a9a4ae8a9c3859e1a8befc940dd9f7 Mon Sep 17 00:00:00 2001
From: Sébastien Moutte <sebastien@moutte.net>
Date: Sun, 11 Feb 2007 12:57:47 +0000
Subject: gst/avi/gstavimux.c: Comment a #if 0 in caps template definition as
 VS6 seems to do not support it.

Original commit message from CVS:
* gst/avi/gstavimux.c:
Comment a #if 0 in caps template definition as VS6 seems to
do not support it.
* gst/rtsp/gstrtspsrc.c:(gst_rtspsrc_loop_udp):
Use gst_guint64_to_gdouble for conversion.
* gst/rtsp/rtspconnection.c:(rtsp_connection_send):
Move variables declaration before the first instruction.
* gst/rtsp/rtspdefs.c:(rtsp_strresult):
Don't use hstrerror for error log on G_OS_WIN32 build as it's not supported.
And don't include netdb.h for G_OS_WIN32
* gst/rtsp/sdpmessage.c:(sdp_parse_line):
This initialization SDPMedia nmedia = {.media = NULL }; is not supported
by VS6 then use an other way to initialize SDPMedia structure.
* gst/udp/gstdynudpsink.h:
* gst/udp/gstdynudpnetutils.h:
Do not include <sys/time.h> for G_OS_WIN32
* gst/udp/gstudpsrc.c:
Define socklen_t as int for G_OS_WIN32
* win/common/config.h.in:
Undef HAVE_NETINET_IN_H
* win32/vs6/gst_plugins_good.dsw:
* win32/vs6/libgstrtp.dsp:
* win32/vs6/libgstrtsp.dsp:
* win32/vs6/libgstautogen.dsp:
* win32/vs6/libgstaudiofx.dsp:
* win32/vs6/libgstudp.dsp:
Add and update project files.
* win32/common/gstudp-enumtypes.c:
* win32/common/gstudp-enumtypes.h:
Add a copy of udp enumtypes to win32/common as in core
and base.
---
 win32/common/config.h           |  2 +-
 win32/common/config.h.in        |  2 +-
 win32/common/gstudp-enumtypes.c | 25 +++++++++++++++++++++++++
 win32/common/gstudp-enumtypes.h | 19 +++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 win32/common/gstudp-enumtypes.c
 create mode 100644 win32/common/gstudp-enumtypes.h

(limited to 'win32/common')

diff --git a/win32/common/config.h b/win32/common/config.h
index 506adb50..64c00cba 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -163,7 +163,7 @@
 #undef HAVE_MMAP
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
+#undef HAVE_NETINET_IN_H
 
 /* support for features: osssrc osssink */
 #define HAVE_OSS 
diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index 28993c96..554197e5 100644
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -163,7 +163,7 @@
 #undef HAVE_MMAP
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
+#undef HAVE_NETINET_IN_H
 
 /* support for features: osssrc osssink */
 #define HAVE_OSS 
diff --git a/win32/common/gstudp-enumtypes.c b/win32/common/gstudp-enumtypes.c
new file mode 100644
index 00000000..46f19db8
--- /dev/null
+++ b/win32/common/gstudp-enumtypes.c
@@ -0,0 +1,25 @@
+
+/* Generated data (by glib-mkenums) */
+
+#include <gstudp.h>
+
+/* enumerations from "gstudp.h" */
+GType
+gst_udp_control_get_type (void)
+{
+  static GType etype = 0;
+
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      {CONTROL_ZERO, "CONTROL_ZERO", "zero"},
+      {CONTROL_NONE, "CONTROL_NONE", "none"},
+      {CONTROL_UDP, "CONTROL_UDP", "udp"},
+      {CONTROL_TCP, "CONTROL_TCP", "tcp"},
+      {0, NULL, NULL}
+    };
+    etype = g_enum_register_static ("GstUDPControl", values);
+  }
+  return etype;
+}
+
+/* Generated data ends here */
diff --git a/win32/common/gstudp-enumtypes.h b/win32/common/gstudp-enumtypes.h
new file mode 100644
index 00000000..6b0697a9
--- /dev/null
+++ b/win32/common/gstudp-enumtypes.h
@@ -0,0 +1,19 @@
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef __GST_UDP_ENUM_TYPES_H__
+#define __GST_UDP_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "gstudp.h" */
+GType gst_udp_control_get_type (void);
+#define GST_TYPE_UDP_CONTROL (gst_udp_control_get_type())
+G_END_DECLS
+
+#endif /* __GST_UDP_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+
-- 
cgit