diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2011-01-29 18:02:11 +0100 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2011-01-31 18:55:21 +0100 |
commit | af1340979860e71e59f6124bd1ce988c71ea17f5 (patch) | |
tree | ab8fffabf57df66a04917194de118b9492dec573 /libs/gst/net | |
parent | b93b05653ee66728b80960e923aa967cb30fc0c8 (diff) |
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.
Diffstat (limited to 'libs/gst/net')
-rw-r--r-- | libs/gst/net/gstnettimeprovider.c | 8 | ||||
-rw-r--r-- | 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 a3e80e008..b04d28243 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 204d781e8..c9609e16a 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> |