luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsocket: make this compile on Windows again

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=668071
This commit is contained in:
Dan Winship 2012-01-17 19:46:34 -05:00
parent 28f3d4dbff
commit 08036ce303
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1067,7 +1067,7 @@ if $glib_failed ; then
AC_MSG_ERROR([Could not determine values for MSG_* constants])
fi
AC_CHECK_FUNCS(getprotobyname_r endservent)
AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex)
AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h])
if test $glib_native_win32 = no; then

24
gio/gsocket.c
View File

@ -1898,7 +1898,7 @@ static gboolean
g_socket_multicast_group_operation (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *interface,
const gchar *iface,
gboolean join_group,
GError **error)
{
@ -1925,8 +1925,8 @@ g_socket_multicast_group_operation (GSocket *socket,
memcpy (&mc_req.imr_multiaddr, native_addr, sizeof (struct in_addr));
#ifdef HAVE_IP_MREQN
if (interface)
mc_req.imr_ifindex = if_nametoindex (interface);
if (iface)
mc_req.imr_ifindex = if_nametoindex (iface);
else
mc_req.imr_ifindex = 0; /* Pick any. */
#else
@ -1945,9 +1945,11 @@ g_socket_multicast_group_operation (GSocket *socket,
struct ipv6_mreq mc_req_ipv6;
memcpy (&mc_req_ipv6.ipv6mr_multiaddr, native_addr, sizeof (struct in6_addr));
if (interface)
mc_req_ipv6.ipv6mr_interface = if_nametoindex (interface);
#ifdef HAVE_IF_NAMETOINDEX
if (iface)
mc_req_ipv6.ipv6mr_interface = if_nametoindex (iface);
else
#endif
mc_req_ipv6.ipv6mr_interface = 0;
optname = join_group ? IPV6_JOIN_GROUP : IPV6_LEAVE_GROUP;
@ -1976,7 +1978,7 @@ g_socket_multicast_group_operation (GSocket *socket,
* g_socket_join_multicast_group:
* @socket: a #GSocket.
* @group: a #GInetAddress specifying the group address to join.
* @interface: Interface to use
* @iface: Interface to use
* @source_specific: %TRUE if source-specific multicast should be used
* @error: #GError for error reporting, or %NULL to ignore.
*
@ -1996,17 +1998,17 @@ gboolean
g_socket_join_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *interface,
const gchar *iface,
GError **error)
{
return g_socket_multicast_group_operation (socket, group, source_specific, interface, TRUE, error);
return g_socket_multicast_group_operation (socket, group, source_specific, iface, TRUE, error);
}
/**
* g_socket_leave_multicast_group:
* @socket: a #GSocket.
* @group: a #GInetAddress specifying the group address to leave.
* @interface: Interface to use
* @iface: Interface to use
* @source_specific: %TRUE if source-specific multicast should be used
* @error: #GError for error reporting, or %NULL to ignore.
*
@ -2024,10 +2026,10 @@ gboolean
g_socket_leave_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *interface,
const gchar *iface,
GError **error)
{
return g_socket_multicast_group_operation (socket, group, source_specific, interface, FALSE, error);
return g_socket_multicast_group_operation (socket, group, source_specific, iface, FALSE, error);
}
/**

4
gio/gsocket.h
View File

@ -123,12 +123,12 @@ gboolean g_socket_bind (GSocket
gboolean g_socket_join_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *interface,
const gchar *iface,
GError **error);
gboolean g_socket_leave_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *interface,
const gchar *iface,
GError **error);
gboolean g_socket_connect (GSocket *socket,
GSocketAddress *address,