diff options
| author | Sébastien Moutte <sebastien@moutte.net> | 2007-02-11 12:57:47 +0000 |
|---|---|---|
| committer | Sébastien Moutte <sebastien@moutte.net> | 2007-02-11 12:57:47 +0000 |
| commit | 9c8ea35617a9a4ae8a9c3859e1a8befc940dd9f7 (patch) | |
| tree | 7a5577b6014e501857c9277520140b54ae121a5e /gst/udp | |
| parent | e687b50f6259b2621b309e070e250d99552350fa (diff) | |
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.
Diffstat (limited to 'gst/udp')
| -rw-r--r-- | gst/udp/gstdynudpsink.h | 2 | ||||
| -rw-r--r-- | gst/udp/gstudpnetutils.h | 2 | ||||
| -rw-r--r-- | gst/udp/gstudpsrc.c | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/gst/udp/gstdynudpsink.h b/gst/udp/gstdynudpsink.h index e57a0ef2..0c300c95 100644 --- a/gst/udp/gstdynudpsink.h +++ b/gst/udp/gstdynudpsink.h @@ -30,7 +30,9 @@ G_BEGIN_DECLS #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" diff --git a/gst/udp/gstudpnetutils.h b/gst/udp/gstudpnetutils.h index ab4fd9d6..86c90151 100644 --- a/gst/udp/gstudpnetutils.h +++ b/gst/udp/gstudpnetutils.h @@ -21,7 +21,6 @@ #ifndef __GST_UDP_NET_UTILS_H__ #define __GST_UDP_NET_UTILS_H__ -#include <sys/time.h> #include <sys/types.h> /* Needed for G_OS_XXXX */ @@ -36,6 +35,7 @@ #include <gst/gstinfo.h> #else +#include <sys/time.h> #include <netinet/in.h> #include <netdb.h> #include <sys/socket.h> diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index b3e4b42d..f2a59e33 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -111,6 +111,9 @@ #include <stdlib.h> #include <gst/netbuffer/gstnetbuffer.h> +#ifdef G_OS_WIN32 +typedef int socklen_t; +#endif #ifdef HAVE_FIONREAD_IN_SYS_FILIO #include <sys/filio.h> |