Changeset 21456 for trunk/include/win

Timestamp:

Sep 23, 2010, 10:09:19 PM (15 years ago)

Author:

dmik

Message:

WinSock2: IPPROTO_IP option constants have different values than in Winsock1.1 (closes ticket:10).

Location:

trunk/include/win

Files:

• winsock.h (modified) (2 diffs)
• winsock2.h (modified) (2 diffs)
• ws2tcpip.h (added)

trunk/include/win/winsock.h

@@ -233 +233 @@
 typedef WSADATA *LPWSADATA;
 
+#ifndef __WINSOCK2API__
 #define IP_OPTIONS          1
 #define IP_MULTICAST_IF     2
@@ -242 +243 @@
 #define IP_TOS              8
 #define IP_DONTFRAGMENT     9
-
+#endif
 
 #define IP_DEFAULT_MULTICAST_TTL   1

trunk/include/win/winsock2.h

@@ -8 +8 @@
 #define __WINSOCK2API__
 
-#include "winsock.h"
+#include <winsock.h>
 
 /* proper 4-byte packing */
-#include "pshpack4.h"
+#include <pshpack4.h>
 
 #define SO_GROUP_ID       0x2001
@@ -372 +372 @@
 extern INT WINAPI ioctlsocket(SOCKET s, LONG cmd, ULONG *argp);
 
-#include "poppack.h"
+#include <poppack.h>
 
 #endif