diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-17 16:53:31 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-17 16:53:31 +0100 |
| commit | 59e08fa503a0914b04a470ddad120da88ca2d514 (patch) | |
| tree | f90ea4170911728185979024f085b08a86807a88 /gst | |
| parent | 305901c7cc978caf2c7f8edcda45096a1062957a (diff) | |
configure: Remove socket/winsock specific checks
Not necessary anymore.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/rtp/Makefile.am | 9 | ||||
| -rw-r--r-- | gst/rtp/gstasteriskh263.c | 10 |
2 files changed, 1 insertions, 18 deletions
diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index bfdc5d81b..c26ab6cf1 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -73,13 +73,6 @@ libgstrtp_la_SOURCES = \ gstrtpvrawdepay.c \ gstrtpvrawpay.c - -if HAVE_WINSOCK2_H -WINSOCK2_LIBS = -lws2_32 -else -WINSOCK2_LIBS = -endif - libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-@GST_MAJORMINOR@ \ @@ -88,7 +81,7 @@ libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstrtp-@GST_MAJORMINOR@ \ -lgstpbutils-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) \ - $(WINSOCK2_LIBS) $(LIBM) + $(LIBM) libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c index 1ef184bad..215117301 100644 --- a/gst/rtp/gstasteriskh263.c +++ b/gst/rtp/gstasteriskh263.c @@ -26,16 +26,6 @@ #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> -#else -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -#endif -#endif - #define GST_ASTERISKH263_HEADER_LEN 6 typedef struct _GstAsteriskH263Header |