* include/ws2tcpip.h (getaddrinfo, freeaddrinfo, getnameinfo):

	Guard with _WIN32_WINNT >= 0x0501. Add FIXME comment.
	* gai_strerror[AW]: Put into #if 0 block.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 5efaa24..d9c88e9 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-07  Danny Smith  <dannysmith@users.sourceforge.net>
 
+       * include/ws2tcpip.h (getaddrinfo, freeaddrinfo, getnameinfo):
+       Guard with _WIN32_WINNT >= 0x0501. Add FIXME comment.
+       * gai_strerror[AW]: Put into #if 0 block.
+
+2005-03-07  Danny Smith  <dannysmith@users.sourceforge.net>
+
        * include/basetyps.h (__int16): Correct define.
 
 2005-02-10  Jiri Malak  <Jiri.Malak@iol.cz>

diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h
index ac66fb0..78095d3 100644 (file)
--- a/winsup/w32api/include/ws2tcpip.h
+++ b/winsup/w32api/include/ws2tcpip.h
@@ -294,10 +294,19 @@ struct addrinfo {
        struct addrinfo  *ai_next;
 };
 
+#if (_WIN32_WINNT >= 0x0501)
 void WSAAPI freeaddrinfo (struct addrinfo*);
 int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*,
                        struct addrinfo**);
+int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
+                      char*,DWORD,int);
+#else
+/* FIXME: Need WS protocol-independent API helpers.  */
+#endif
 
+#if 0
+/* These are not exported from any known w32api library.  Are they
+   implemented as macros or inline finctions?  */
 char* WSAAPI gai_strerrorA(int);
 WCHAR* WSAAPI gai_strerrorW(int);
 #ifdef UNICODE
@@ -305,10 +314,7 @@ WCHAR* WSAAPI gai_strerrorW(int);
 #else
 #define gai_strerror   gai_strerrorA
 #endif  /* UNICODE */
-
-int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
-                      char*,DWORD,int);
-
+#endif /* 0 */
 
 /* Some older IPv4/IPv6 compatability stuff */