2006-07-06 Jim Hyslop <jhyslop@dreampossible.ca> (tiny change)

	* lib/getaddrinfo.c: Changes to compile under MSVC6: changed
	'#if WIN32_NATIVE' to '#ifdef' & moved WSAAPI macro inside
	brackets.  Other minor changes to suppress some compiler
	warnings.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1f247d4c764d0ffd0f25abf7fab9b3398a4807b7..cf85e331af9ca0ade8f85323ecac5d1a51fc5a56 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-06  Jim Hyslop  <jhyslop@dreampossible.ca>  (tiny change)
+
+       * lib/getaddrinfo.c: Changes to compile under MSVC6: changed
+       '#if WIN32_NATIVE' to '#ifdef' & moved WSAAPI macro inside
+       brackets.  Other minor changes to suppress some compiler
+       warnings.
+
 2006-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * getloadavg.c: Use __VMS, not VMS.

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index c54d407d06980999c7a4621e3c7a6cf14dc022bf..e6bad11038e11348d5684dd047e8d24b51d895c8 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -47,11 +47,11 @@
 #endif
 
 #ifdef WIN32_NATIVE
-typedef int WSAAPI (*getaddrinfo_func) (const char*, const char*,
+typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*,
                                        const struct addrinfo*,
                                        struct addrinfo**);
-typedef void WSAAPI (*freeaddrinfo_func) (struct addrinfo*);
-typedef int WSAAPI (*getnameinfo_func) (const struct sockaddr*,
+typedef void (WSAAPI *freeaddrinfo_func) (struct addrinfo*);
+typedef int (WSAAPI *getnameinfo_func) (const struct sockaddr*,
                                        socklen_t, char*, DWORD,
                                        char*, DWORD, int);
 
@@ -74,9 +74,9 @@ use_win32_p (void)
 
   if (h)
     {
-      getaddrinfo_ptr = GetProcAddress (h, "getaddrinfo");
-      freeaddrinfo_ptr = GetProcAddress (h, "freeaddrinfo");
-      getnameinfo_ptr = GetProcAddress (h, "getnameinfo");
+      getaddrinfo_ptr = (getaddrinfo_func) GetProcAddress (h, "getaddrinfo");
+      freeaddrinfo_ptr = (freeaddrinfo_func) GetProcAddress (h, "freeaddrinfo");
+      getnameinfo_ptr = (getnameinfo_func) GetProcAddress (h, "getnameinfo");
     }
 
   /* If either is missing, something is odd. */
@@ -296,7 +296,10 @@ freeaddrinfo (struct addrinfo *ai)
 {
 #ifdef WIN32_NATIVE
   if (use_win32_p ())
-    return freeaddrinfo_ptr (ai);
+    {
+      freeaddrinfo_ptr (ai);
+      return;
+    }
 #endif
 
   while (ai)
@@ -316,7 +319,7 @@ int getnameinfo(const struct sockaddr *restrict sa, socklen_t salen,
                char *restrict service, socklen_t servicelen,
                int flags)
 {
-#if WIN32_NATIVE
+#ifdef WIN32_NATIVE
   if (use_win32_p ())
     return getnameinfo_ptr (sa, salen, node, nodelen,
                            service, servicelen, flags);