Changeset 497 for trunk/Include/api_winsock2.sbp

Timestamp:

Mar 28, 2008, 5:43:34 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

インクルードガードとその他不要な前処理定義などの削除

File:

• trunk/Include/api_winsock2.sbp (modified) (10 diffs)

trunk/Include/api_winsock2.sbp

@@ -2 +2 @@
 #define _WINSOCK2API_
 #define _WINSOCKAPI_
-/*
-#ifndef INCL_WINSOCK_API_PROTOTYPES
-#define INCL_WINSOCK_API_PROTOTYPES 1
-#endif
-
-#ifndef INCL_WINSOCK_API_TYPEDEFS
-#define INCL_WINSOCK_API_TYPEDEFS 0
-#endif
-*/
 
 Const WINSOCK_VERSION = MAKEWORD(2, 2)
@@ -218 +209 @@
 Const IMPLINK_HIGHEXPER = 158
 
-#ifndef s_addr
-#define s_addr
 ' Internet address (old style... should be updated)
 Type /*Class*/ in_addr
@@ -281 +270 @@
 */
 End Type 'Class
-#endif
 
 Const IN_CLASSA(i) = (((i) As DWord And &h80000000) = 0)
@@ -557 +545 @@
 Const FD_ALL_EVENTS = ((1 << FD_MAX_EVENTS) - 1)
 
-#include <api_winerror.sbp>
+#require <api_winerror.sbp>
 
 ' Compatibility macros.
@@ -602 +590 @@
 TypeDef LPWSABUF = *WSABUF
 
-#include <qos.ab>
+#require <qos.ab>
 
 Type QOS 'struct _QualityOfService
@@ -918 +906 @@
 ' registration (RNR) API
 
-#ifndef _tagBLOB_DEFINED
-#define _tagBLOB_DEFINED
-#define _BLOB_DEFINED
-#define _LPBLOB_DEFINED
 Type BLOB
     cbSize As DWord
@@ -931 +915 @@
 End Type
 TypeDef LPBLOB = *BLOB
-#endif
 
 ' Service Install Flags
@@ -970 +953 @@
 Const RES_UNUSED_1 = (&h00000001)
 Const RES_FLUSH_CACHE = (&h00000002)
-#ifndef RES_SERVICE
-#define RES_SERVICE
 Const RES_SERVICE = (&h00000004)
-#endif /* RES_SERVICE */
 
 ' Well known value names for Service Types
 
-Const SERVICE_TYPE_VALUE_IPXPORTA = "IpxSocket"
+'Const SERVICE_TYPE_VALUE_IPXPORTA = "IpxSocket"
 'Const SERVICE_TYPE_VALUE_IPXPORTW = L"IpxSocket"
-Const SERVICE_TYPE_VALUE_SAPIDA = "SapId"
+'Const SERVICE_TYPE_VALUE_SAPIDA = "SapId"
 'Const SERVICE_TYPE_VALUE_SAPIDW = L"SapId"
 
-Const SERVICE_TYPE_VALUE_TCPPORTA = "TcpPort"
+'Const SERVICE_TYPE_VALUE_TCPPORTA = "TcpPort"
 'Const SERVICE_TYPE_VALUE_TCPPORTW = L"TcpPort"
 
-Const SERVICE_TYPE_VALUE_UDPPORTA = "UdpPort"
+'Const SERVICE_TYPE_VALUE_UDPPORTA = "UdpPort"
 'Const SERVICE_TYPE_VALUE_UDPPORTW = L"UdpPort"
 
-Const SERVICE_TYPE_VALUE_OBJECTIDA = "ObjectId"
+'Const SERVICE_TYPE_VALUE_OBJECTIDA = "ObjectId"
 'Const SERVICE_TYPE_VALUE_OBJECTIDW = L"ObjectId"
-
-#ifdef UNICODE
 /*
+#ifdef UNICODE
 Const SERVICE_TYPE_VALUE_SAPID = SERVICE_TYPE_VALUE_SAPIDW
 Const SERVICE_TYPE_VALUE_TCPPORT = SERVICE_TYPE_VALUE_TCPPORTW
 Const SERVICE_TYPE_VALUE_UDPPORT = SERVICE_TYPE_VALUE_UDPPORTW
 Const SERVICE_TYPE_VALUE_OBJECTID = SERVICE_TYPE_VALUE_OBJECTIDW
-*/
-#else
-
+#else
 Const SERVICE_TYPE_VALUE_SAPID = SERVICE_TYPE_VALUE_SAPIDA
 Const SERVICE_TYPE_VALUE_TCPPORT = SERVICE_TYPE_VALUE_TCPPORTA
 Const SERVICE_TYPE_VALUE_UDPPORT = SERVICE_TYPE_VALUE_UDPPORTA
 Const SERVICE_TYPE_VALUE_OBJECTID = SERVICE_TYPE_VALUE_OBJECTIDA
-
-#endif
-
-#ifndef __CSADDR_DEFINED__
-#define __CSADDR_DEFINED__
+#endif
+*/
+Const SERVICE_TYPE_VALUE_IPXPORT = "IpxSocket"
+Const SERVICE_TYPE_VALUE_SAPID = "SapId"
+Const SERVICE_TYPE_VALUE_TCPPORT = "TcpPort"
+Const SERVICE_TYPE_VALUE_UDPPORT = "UdpPort"
+Const SERVICE_TYPE_VALUE_OBJECTID = "ObjectId"
 
 ' SockAddr Information
@@ -1027 +1006 @@
 TypeDef PCSADDR_INFO = *CSADDR_INFO
 TypeDef LPCSADDR_INFO = *CSADDR_INFO
-#endif
 
 ' Address list returned via SIO_ADDRESS_LIST_QUERY
@@ -2136 +2114 @@
 Const WSAGETSELECTERROR(lParam) = HIWORD(lParam)
 
-#ifdef IPV6STRICT
-'#include <wsipv6ok.ab>
-#endif
-
-#endif
+'#ifdef IPV6STRICT
+'#require <wsipv6ok.ab>
+'#endif
+
+#endif