commit 5e4b7de1b6bcbc5c4adff69e12f6ccc9c3f2e313
author Francois Gouget <fgouget@codeweavers.com> Fri Oct 13 23:13:01 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 13 23:13:01 2000 +0000
tree 52ac2f3bdcd618a16fa64d9e1c14b82201f71200
parent 6371e83259c33330c8d25b4d72078b39f12294ac

Completed/corrected the list of include files.
Handle WIN32_LEAN_AND_MEAN and the NOxxx macros.

include/winsock.h

diff --git a/include/winsock.h b/include/winsock.h
index e803808..101d120 100644
--- a/include/winsock.h
+++ b/include/winsock.h
@@ -7,16 +7,22 @@
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_
 
+#ifndef RC_INVOKED
 #include <sys/types.h>
 
-/* Solaris kludge */
+/* Solaris uses these macro names */
 #undef FSHIFT
-#undef PAGESIZE
 #undef TRANSPARENT
 #include <netinet/in.h>
+/* Restore the Windows values */
+#ifdef _WINUSER_
 #undef FSHIFT
-#undef PAGESIZE
+#define FSHIFT            0x04
+#endif
+#ifdef _WINGDI_
 #undef TRANSPARENT
+#define TRANSPARENT       1
+#endif
 
 #include <arpa/inet.h>
 #include <sys/time.h>
@@ -24,6 +30,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#endif /* RC_INVOKED */
 
 #include "windef.h"