From af1340979860e71e59f6124bd1ce988c71ea17f5 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Sat, 29 Jan 2011 18:02:11 +0100
Subject: [PATCH] net: use socklen_t where appropriate rather than specific
 type

In particular, fixes Cygwin build where socklen_t is defined as int
in line with native win32 api definition.
---
 libs/gst/net/gstnettimeprovider.c | 8 +-------
 libs/gst/net/gstnettimeprovider.h | 4 ++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c
index a3e80e0..b04d282 100644
--- a/libs/gst/net/gstnettimeprovider.c
+++ b/libs/gst/net/gstnettimeprovider.c
@@ -352,7 +352,7 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
 {
   gint ru;
   struct sockaddr_in my_addr;
-  guint len;
+  socklen_t len;
   int port;
   gint ret;
   GError *error;
@@ -387,13 +387,7 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
     goto bind_error;
 
   len = sizeof (my_addr);
-#ifdef G_OS_WIN32
-  ret =
-      getsockname (self->priv->sock.fd, (struct sockaddr *) &my_addr,
-      (gint *) & len);
-#else
   ret = getsockname (self->priv->sock.fd, (struct sockaddr *) &my_addr, &len);
-#endif
   if (ret < 0)
     goto getsockname_error;
 
diff --git a/libs/gst/net/gstnettimeprovider.h b/libs/gst/net/gstnettimeprovider.h
index 204d781..c9609e1 100644
--- a/libs/gst/net/gstnettimeprovider.h
+++ b/libs/gst/net/gstnettimeprovider.h
@@ -35,6 +35,10 @@ G_BEGIN_DECLS
 
 #ifdef G_OS_WIN32
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#ifndef socklen_t
+#define socklen_t int
+#endif
 #else
 #include <netdb.h>
 #include <sys/socket.h>
-- 
2.7.4