From 52b0e40115990074001fef41a779d45f49cca358 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@gmail.com>
Date: Mon, 29 Dec 2008 15:54:44 +0000
Subject: [PATCH] gst/pcapparse/: Patch to make gstpcapparse compile with
 mingw32 gcc. Fixes #565439.

Original commit message from CVS:
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
* gst/pcapparse/Makefile.am:
* gst/pcapparse/gstpcapparse.c:
Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.
---
 ChangeLog                    | 8 ++++++++
 gst/pcapparse/Makefile.am    | 9 ++++++++-
 gst/pcapparse/gstpcapparse.c | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 149eaf8158..d3fb21565a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-29  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
+
+	* gst/pcapparse/Makefile.am:
+	* gst/pcapparse/gstpcapparse.c:
+	Patch to make gstpcapparse compile with mingw32 gcc. Fixes #565439.
+
 2008-12-29  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/rtpmanager/gstrtpsession.c:
diff --git a/gst/pcapparse/Makefile.am b/gst/pcapparse/Makefile.am
index cd6f3dc7ee..838d7ad049 100644
--- a/gst/pcapparse/Makefile.am
+++ b/gst/pcapparse/Makefile.am
@@ -1,5 +1,12 @@
 plugin_LTLIBRARIES = libgstpcapparse.la
 
+# when compiling for windows we need to link with the winsock library
+if HAVE_WINSOCK2_H
+  WINSOCK2_LIBS = -lws2_32
+else
+  WINSOCK2_LIBS = 
+endif
+
 libgstpcapparse_la_SOURCES = \
 	gstpcapparse.c
 
@@ -7,7 +14,7 @@ noinst_HEADERS = \
 	gstpcapparse.h
 
 libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
-libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS)
 libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index 2d323d3c09..546ffbe30e 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -48,7 +48,7 @@
 
 #include <string.h>
 
-#ifndef _MSC_VER
+#ifndef G_OS_WIN32
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <string.h>