summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/include/mswsock.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 73002c0df..d73eeca9c 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-12 Earnie Boyd <earnie@users.sf.net>
+
+ * include/mswsock.h: Correct invalid filter for _WINSOCK2_H.
+ Thanks to Jim Barton <jmbarton@users.sf.net>.
+
2003-03-12 Ranjit Mathew <rmathew@hotmail.com>
* include/winnt.h (_IMAGE_SEPARATE_DEBUG_HEADER): Expose
diff --git a/winsup/w32api/include/mswsock.h b/winsup/w32api/include/mswsock.h
index 385d0b2c3..0cea0b840 100644
--- a/winsup/w32api/include/mswsock.h
+++ b/winsup/w32api/include/mswsock.h
@@ -54,7 +54,7 @@ BOOL PASCAL TransmitFile(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_
BOOL PASCAL AcceptEx(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED);
VOID PASCAL GetAcceptExSockaddrs(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT);
-#ifdef WINSOCK2_H /* These require the winsock2 interface. */
+#ifdef _WINSOCK2_H /* These require the winsock2 interface. */
#define TP_ELEMENT_FILE 1
#define TP_ELEMENT_MEMORY 2
@@ -104,7 +104,7 @@ typedef struct wsacmsghdr {
BOOL PASCAL DisconnectEx(SOCKET,LPOVERLAPPED,DWORD,DWORD);
int PASCAL WSARecvMsg(SOCKET,LPWSAMSG,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-#endif /* WINSOCK2_H */
+#endif /* _WINSOCK2_H */
#ifdef __cplusplus
}