diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-02-23 20:08:58 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-02-23 20:08:58 +0000 |
| commit | 59385bde709e93f31244c0b8119c204a03eec1c4 (patch) | |
| tree | 2403d08966c06e53088544ce955c5528632b6fcf /gst/rtp/gstasteriskh263.c | |
| parent | 8449839ab1f115b33594467daa81e6347e67055c (diff) | |
ext/cdio/Makefile.am: Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be required for Cygwin, see #317048)
Original commit message from CVS:
* ext/cdio/Makefile.am:
Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be
required for Cygwin, see #317048)
* gst/rtp/gstasteriskh263.c:
Cygwin has includes for both the unix network socket API
and the windows API, but only one can be included, so fix
includes to only use one or the other, prefering the unxi
one (#317048).
Diffstat (limited to 'gst/rtp/gstasteriskh263.c')
| -rw-r--r-- | gst/rtp/gstasteriskh263.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c index 9597261c..df93cfe4 100644 --- a/gst/rtp/gstasteriskh263.c +++ b/gst/rtp/gstasteriskh263.c @@ -21,13 +21,15 @@ #include <gst/rtp/gstrtpbuffer.h> #include "gstasteriskh263.h" +/* Cygwin has both netinet/in.h and winsock2.h, but + * only one can be included, so prefer the unix one */ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> -#endif - +#else #ifdef HAVE_WINSOCK2_H # include <winsock2.h> #endif +#endif #define GST_ASTERISKH263_HEADER_LEN 6 |