[GNUnet-SVN] r6482 - in GNUnet/src: include util/network

[gnunet]

Author: grothoff
Date: 2008-02-27 22:58:12 -0700 (Wed, 27 Feb 2008)
New Revision: 6482

Modified:
   GNUnet/src/include/gnunet_util_network.h
   GNUnet/src/util/network/dns.c
Log:
mingw-fix

Modified: GNUnet/src/include/gnunet_util_network.h
===================================================================
--- GNUnet/src/include/gnunet_util_network.h    2008-02-28 03:35:19 UTC (rev 
6481)
+++ GNUnet/src/include/gnunet_util_network.h    2008-02-28 05:58:12 UTC (rev 
6482)
@@ -32,14 +32,6 @@
 #ifndef GNUNET_UTIL_NETWORK_H
 #define GNUNET_UTIL_NETWORK_H
 
-#ifndef MINGW
-/* for struct addr_in, etc. */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#endif
-
 #include "gnunet_util_config.h"
 #include "gnunet_util_string.h"
 #include "gnunet_util_os.h"
@@ -276,6 +268,14 @@
                                                                        
*routeList);
 
 /**
+ * Actual definitions will be in system header files.
+ */ 
+struct sockaddr;
+struct in_addr;
+struct in6_addr;
+
+
+/**
  * Check if the given IP address is in the list of
  * IP addresses.
  * @param list a list of networks
@@ -518,7 +518,7 @@
 GNUNET_get_ip_from_hostname (struct GNUNET_GE_Context *ectx,
                              const char *hostname,
                              int domain,
-                             struct sockaddr **sa, socklen_t * socklen);
+                             struct sockaddr **sa, unsigned int * socklen);
 
 /**
  * Get an IP address as a string (works for both IPv4 and IPv6).  Note

Modified: GNUnet/src/util/network/dns.c
===================================================================
--- GNUnet/src/util/network/dns.c       2008-02-28 03:35:19 UTC (rev 6481)
+++ GNUnet/src/util/network/dns.c       2008-02-28 05:58:12 UTC (rev 6482)
@@ -486,7 +486,8 @@
 GNUNET_get_ip_from_hostname (struct GNUNET_GE_Context *ectx,
                              const char *hostname,
                              int domain,
-                             struct sockaddr **sa, socklen_t * socklen)
+                             struct sockaddr **sa, 
+                            unsigned int * socklen)
 {
   int ret;