pidgin.next.minor: 3b76f09b: Oops, probably better if we have both ge...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Feb 15 22:00:54 EST 2010


-----------------------------------------------------------------
Revision: 3b76f09b9b1fcbbf73ad7179aac8eb1896920f56
Ancestor: 52cc32a56ae4931e4283bd42a1efa4c8eda5657a
Author: darkrain42 at pidgin.im
Date: 2010-02-16T02:56:10
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/3b76f09b9b1fcbbf73ad7179aac8eb1896920f56

Modified files:
        libpurple/network.c

ChangeLog: 

Oops, probably better if we have both getifaddrs() and inet_ntop()

-------------- next part --------------
============================================================
--- libpurple/network.c	0b90658d94de6b28162d3d21107629ffa1ba7600
+++ libpurple/network.c	6bee34054352355a434b132b0249009000f81cf8
@@ -206,7 +206,7 @@ purple_network_get_all_local_system_ips(
 GList *
 purple_network_get_all_local_system_ips(void)
 {
-#ifdef HAVE_GETIFADDRS
+#if defined(HAVE_GETIFADDRS) && defined(HAVE_INET_NTOP)
 	GList *result = NULL;
 	struct ifaddrs *start, *ifa;
 	int ret;
@@ -245,7 +245,7 @@ purple_network_get_all_local_system_ips(
 	freeifaddrs(start);
 
 	return g_list_reverse(result);
-#else /* HAVE_GETIFADDRS */
+#else /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
 	GList *result = NULL;
 	int source = socket(PF_INET,SOCK_STREAM, 0);
 	char buffer[1024];
@@ -279,7 +279,7 @@ purple_network_get_all_local_system_ips(
 	}
 
 	return result;
-#endif /* HAVE_GETIFADDRS */
+#endif /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
 }
 
 const char *


More information about the Commits mailing list