aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2005-03-07 08:32:24 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2005-03-07 08:32:24 +0000
commitd34d3da637bf845f5cbb269328490069940e1ba8 (patch)
tree8defa5ec9ae5a2691dd1882c756a04389a326f7d
parent4f7e895a3afec6fdbcf7b87899f695f505fe850c (diff)
downloadnewlib-d34d3da637bf845f5cbb269328490069940e1ba8.zip
newlib-d34d3da637bf845f5cbb269328490069940e1ba8.tar.gz
newlib-d34d3da637bf845f5cbb269328490069940e1ba8.tar.bz2
* include/ws2tcpip.h (getaddrinfo, freeaddrinfo, getnameinfo):
Guard with _WIN32_WINNT >= 0x0501. Add FIXME comment. * gai_strerror[AW]: Put into #if 0 block.
-rw-r--r--winsup/w32api/ChangeLog6
-rw-r--r--winsup/w32api/include/ws2tcpip.h14
2 files changed, 16 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 5efaa24..d9c88e9 100644
--- 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
--- 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 */