From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 7 Jul 2006 07:37:16 +0000 (+0000)
Subject: 2006-07-06  Jim Hyslop  <jhyslop@dreampossible.ca>  (tiny change)
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d1fd5fe3cb0a01d3def6ec7d042ffd3abd4a6a0;p=pspp

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 1f247d4c76..cf85e331af 100644
--- 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 c54d407d06..e6bad11038 100644
--- 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);