getaddrinfo: Initialize sockets, to make it work under Windows.

diff --git a/ChangeLog b/ChangeLog
index e4692b70d26ff6342c5e5bc2b94c9e79878ee3ec..cfcf9a978ec82b18de459d273ebd8433e9108519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  Simon Josefsson  <simon@josefsson.org>
+
+       * modules/getaddrinfo (Depends-on): Depend on the sockets module.
+       * lib/getaddrinfo.c (use_win32_p): Call gl_sockets_startup to make
+       sure Windows sockets are working before calling getaddrinfo.
+       * tests/test-getaddrinfo.c (main): Don't call WSAStartup here.
+       * doc/gnulib.texi (Windows sockets): Fix typo.
+
 2010-09-25  Bruno Haible  <bruno@clisp.org>
 
        Tests for module 'regex-quote'.

diff --git a/doc/gnulib.texi b/doc/gnulib.texi
index fd5485ef298e2728f7275a50ba64ef930da30510..3e1599c801ee9cb591bb253039e5ac01d3329bde 100644 (file)
--- a/doc/gnulib.texi
+++ b/doc/gnulib.texi
@@ -989,7 +989,7 @@ XP.  The function declaration is present if @code{WINVER >= 0x0501}.
 Windows 2000 does not have getaddrinfo in its @file{WS2_32.DLL}.
 
 Thus, if you want to assume Windows XP or later, you can add
-AC_DEFINE(WINVER, 0x0501) to avoid compiling to (partial) getaddrinfo
+AC_DEFINE(WINVER, 0x0501) to avoid compiling the (partial) getaddrinfo
 implementation.
 
 If you want to support Windows 2000, don't do anything.  The

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index 76dc19e6c4f945a1fa725abeb2d5a6174046b773..ce756478ce9d00a3cb2376d892489bba49e2c9d4 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -59,6 +59,9 @@
 # define WIN32_NATIVE
 #endif
 
+/* gl_sockets_startup */
+#include "sockets.h"
+
 #ifdef WIN32_NATIVE
 typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*,
                                         const struct addrinfo*,
@@ -101,6 +104,8 @@ use_win32_p (void)
       return 0;
     }
 
+  gl_sockets_startup (SOCKETS_1_1);
+
   return 1;
 }
 #endif

diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index f51365223dbbe2fd369954924d086cea88552472..1aa7208039fe44632284d7c8fddef99400e8c87e 100644 (file)
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -17,6 +17,7 @@ netdb
 strdup
 servent
 hostent
+sockets
 
 configure.ac:
 gl_GETADDRINFO

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index bd245b427bcfbc571eb679ecf89a62636fdd6fa9..15d6569b4a4b9e96ffae8e17c72f3dd788de3b5d 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -161,25 +161,6 @@ simple (char const *host, char const *service)
 
 int main (void)
 {
-#if _WIN32
-  {
-    WORD requested;
-    WSADATA data;
-    int err;
-
-    requested = MAKEWORD (1, 1);
-    err = WSAStartup (requested, &data);
-    if (err != 0)
-      return 1;
-
-    if (data.wVersion < requested)
-      {
-        WSACleanup ();
-        return 2;
-      }
-  }
-#endif
-
   return simple (HOST1, SERV1)
     + simple (HOST2, SERV2)
     + simple (HOST3, SERV3)