Index: trunk/src/wsock32/wsock32.c
===================================================================
--- trunk/src/wsock32/wsock32.c	(revision 8)
+++ trunk/src/wsock32/wsock32.c	(revision 11)
@@ -1,3 +1,3 @@
-/* $Id: wsock32.c,v 1.1 1999-05-24 20:20:09 ktk Exp $ */
+/* $Id: wsock32.c,v 1.2 1999-05-31 14:09:47 phaller Exp $ */
 
 /*
@@ -13,6 +13,11 @@
  * @(#) wsock32.c     	1.0.0   1998/08/25 VV initial release
  *                      1.0.1   1999/04/27 VV cleanup and implement select.
+ *                      1.0.2   1999/05/31 PH support for TCP/IP 4.1 + 4.2 headers
  *
  */
+
+/* this is for IBM TCP/IP 5.0 headers as present in the current Warp 4 toolkit */
+#define TCPV40HDRS 1
+
 
 #define INCL_DOSPROCESS     /* Process and thread values */
Index: trunk/src/wsock32/wsock32.def
===================================================================
--- trunk/src/wsock32/wsock32.def	(revision 8)
+++ trunk/src/wsock32/wsock32.def	(revision 11)
@@ -1,86 +1,84 @@
 ;Created by BLAST for IBM's compiler
+
 LIBRARY WSOCK32 INITINSTANCE
 DATA MULTIPLE NONSHARED
 EXPORTS
-;   _WSAFDIsSet =       _OS2_WSAFDIsSet@8      
-;   Arecv = _OS2Arecv 
-;   Asend = _OS2Asend
-;   EnumProtocolsA = _OS2EnumProtocolsA
-;   EnumProtocolsW = _OS2EnumProtocolsW
-;   GetAddressByNameA = _OS2GetAddressByNameA
-;   GetAddressByNameW = _OS2GetAddressByNameW
-;   GetNameByTypeA = _OS2GetNameByTypeA
-;   GetNameByTypeW = _OS2GetNameByTypeW
-;   GetServiceA = _OS2GetServiceA
-;   GetServiceW = _OS2GetServiceW
-;   GetTypeByNameA = _OS2GetTypeByNameA
-;   GetTypeByNameW = _OS2GetTypeByNameW
-;   NPLoadNameSpaces = _OS2NPLoadNameSpaces
-;   SetServiceA = _OS2SetServiceA
-;   SetServiceW = _OS2SetServiceW
-;   TransmitFile = _OS2TransmitFile
-   accept =       		_OS2accept@12      			@1
-   bind =       		_OS2bind@12      			@2
-   closesocket =       	_OS2closesocket@4      			@3
-   connect =       		_OS2connect@12      			@4
-   getpeername =       	_OS2getpeername@12      		@5
-   getsockname =       	_OS2getsockname@12      		@6
-   getsockopt =       	_OS2getsockopt@20      			@7
-   htonl =       		_OS2htonl@4      			@8
-   htons =       		_OS2htons@4      			@9
-   inet_addr =       	_OS2inet_addr@4      			@10
-   inet_ntoa =       	_OS2inet_ntoa@4      			@11
-   ioctlsocket =       	_OS2ioctlsocket@12      		@12
-   listen =       		_OS2listen@8      			@13
-   ntohl =       		_OS2ntohl@4      			@14
-   ntohs =       		_OS2ntohs@4      			@15
-   recv =       		_OS2recv@16      			@16
-   recvfrom =       		_OS2recvfrom@24      			@17
-   select =       		_OS2select@20      			@18
-   send =       		_OS2send@16      			@19
-   sendto =       		_OS2sendto@24      			@20
-   setsockopt =       	_OS2setsockopt@20      			@21
-   shutdown =       		_OS2shutdown@8      			@22
-   socket =       		_OS2socket@12      			@23
 
-   gethostbyaddr =       	_OS2gethostbyaddr@12      		@51
-   gethostbyname =       	_OS2gethostbyname@4      		@52
-   getprotobyname =       	_OS2getprotobyname@4      		@53
-   getprotobynumber =       	_OS2getprotobynumber@4      		@54
-   getservbyname =       	_OS2getservbyname@8      		@55
-   getservbyport =       	_OS2getservbyport@8      		@56
-   gethostname =       	_OS2gethostname@8      			@57
+  accept                   = _OS2accept@12                     @1
+  bind                     = _OS2bind@12                       @2
+  closesocket              = _OS2closesocket@4                 @3
+  connect                  = _OS2connect@12                    @4
+  getpeername              = _OS2getpeername@12                @5
+  getsockname              = _OS2getsockname@12                @6
+  getsockopt               = _OS2getsockopt@20                 @7
+  htonl                    = _OS2htonl@4                       @8
+  htons                    = _OS2htons@4                       @9
+  inet_addr                = _OS2inet_addr@4                   @10
+  inet_ntoa                = _OS2inet_ntoa@4                   @11
+  ioctlsocket              = _OS2ioctlsocket@12                @12
+  listen                   = _OS2listen@8                      @13
+  ntohl                    = _OS2ntohl@4                       @14
+  ntohs                    = _OS2ntohs@4                       @15
+  recv                     = _OS2recv@16                       @16
+  recvfrom                 = _OS2recvfrom@24                   @17
+  select                   = _OS2select@20                     @18
+  send                     = _OS2send@16                       @19
+  sendto                   = _OS2sendto@24                     @20
+  setsockopt               = _OS2setsockopt@20                 @21
+  shutdown                 = _OS2shutdown@8                    @22
+  socket                   = _OS2socket@12                     @23
+  gethostbyaddr            = _OS2gethostbyaddr@12              @51
+  gethostbyname            = _OS2gethostbyname@4               @52
+  getprotobyname           = _OS2getprotobyname@4              @53
+  getprotobynumber         = _OS2getprotobynumber@4            @54
+  getservbyname            = _OS2getservbyname@8               @55
+  getservbyport            = _OS2getservbyport@8               @56
+  gethostname              = _OS2gethostname@8                 @57
 
-   WSAAsyncSelect =       	_OS2WSAAsyncSelect@16      		@101
-   WSAAsyncGetHostByAddr =  	_OS2WSAAsyncGetHostByAddr@28   		@102
-   WSAAsyncGetHostByName =   _OS2WSAAsyncGetHostByName@20  		@103
-   WSAAsyncGetProtoByNumber =_OS2WSAAsyncGetProtoByNumber@20  	@104
-   WSAAsyncGetProtoByName =  _OS2WSAAsyncGetProtoByName@20	  	@105   
-   WSAAsyncGetServByPort =   _OS2WSAAsyncGetServByPort@24     	@106 
-   WSAAsyncGetServByName =   _OS2WSAAsyncGetServByName@24     	@107 
-   WSACancelAsyncRequest =   _OS2WSACancelAsyncRequest@4      	@108
-   WSASetBlockingHook =      _OS2WSASetBlockingHook@4      		@109
-   WSAUnhookBlockingHook =   _OS2WSAUnhookBlockingHook@0      	@110
-   WSAGetLastError =       	_OS2WSAGetLastError@0			@111      
-   WSASetLastError =       	_OS2WSASetLastError@4      		@112
-   WSACancelBlockingCall =   _OS2WSACancelBlockingCall@0      	@113
-   WSAIsBlocking =       	_OS2WSAIsBlocking@0     		@114
-   WSAStartup =       	_OS2WSAStartup@8      			@115
-   WSACleanup =       	_OS2WSACleanup@0			@116
+  WSAAsyncSelect           = _OS2WSAAsyncSelect@16             @101
+  WSAAsyncGetHostByAddr    = _OS2WSAAsyncGetHostByAddr@28      @102
+  WSAAsyncGetHostByName    = _OS2WSAAsyncGetHostByName@20      @103
+  WSAAsyncGetProtoByNumber = _OS2WSAAsyncGetProtoByNumber@20   @104
+  WSAAsyncGetProtoByName   = _OS2WSAAsyncGetProtoByName@20     @105   
+  WSAAsyncGetServByPort    = _OS2WSAAsyncGetServByPort@24      @106 
+  WSAAsyncGetServByName    = _OS2WSAAsyncGetServByName@24      @107 
+  WSACancelAsyncRequest    = _OS2WSACancelAsyncRequest@4       @108
+  WSASetBlockingHook       = _OS2WSASetBlockingHook@4          @109
+  WSAUnhookBlockingHook    = _OS2WSAUnhookBlockingHook@0       @110
+  WSAGetLastError          = _OS2WSAGetLastError@0             @111      
+  WSASetLastError          = _OS2WSASetLastError@4             @112
+  WSACancelBlockingCall    = _OS2WSACancelBlockingCall@0       @113
+  WSAIsBlocking            = _OS2WSAIsBlocking@0               @114
+  WSAStartup               = _OS2WSAStartup@8                  @115
+  WSACleanup               = _OS2WSACleanup@0                  @116
+  __WSAFDIsSet             = _OS2__WSAFDIsSet@8                @151
 
-   __WSAFDIsSet =       	_OS2__WSAFDIsSet@8      		@151
+; Arecv                    = _OS2Arecv
+; Asend                    = _OS2Asend
+; EnumProtocolsA           = _OS2EnumProtocolsA
+; EnumProtocolsW           = _OS2EnumProtocolsW
+; GetAddressByNameA        = _OS2GetAddressByNameA
+; GetAddressByNameW        = _OS2GetAddressByNameW
+; GetNameByTypeA           = _OS2GetNameByTypeA
+; GetNameByTypeW           = _OS2GetNameByTypeW
+; GetServiceA              = _OS2GetServiceA
+; GetServiceW              = _OS2GetServiceW
+; GetTypeByNameA           = _OS2GetTypeByNameA
+; GetTypeByNameW           = _OS2GetTypeByNameW
+; NPLoadNameSpaces         = _OS2NPLoadNameSpaces
+; SetServiceA              = _OS2SetServiceA
+; SetServiceW              = _OS2SetServiceW
+; TransmitFile             = _OS2TransmitFile
+; WsControl                = _OS2WsControl                     @1000
+; closesockinfo            = _OS2closesockinfo                 @1001
+; WSHEnumProtocols         = _OS2WSHEnumProtocols              @1004
+; inet_network             = _OS2inet_network                  @1100
+; getnetbyname             = _OS2getnetbyname                  @1101
+; rcmd                     = _OS2rcmd                          @1102
+; rexec                    = _OS2rexec                         @1103
+; rresvport                = _OS2rresvport                     @1104
+; sethostname              = _OS2sethostname                   @1105
+; dn_expand                = _OS2dn_expand                     @1106
 
-;   WsControl = 		_OS2WsControl				@1000
-;   closesockinfo = 		_OS2closesockinfo			@1001
-;   WSHEnumProtocols = 	_OS2WSHEnumProtocols			@1004
-;   inet_network = 		_OS2inet_network			@1100
-;   getnetbyname = 		_OS2getnetbyname			@1101
-;   rcmd = 			_OS2rcmd				@1102
-;   rexec =       		_OS2rexec				@1103
-;   rresvport = 		_OS2rresvport				@1104
-;   sethostname = 		_OS2sethostname				@1105
-;   dn_expand = 		_OS2dn_expand				@1106
-   WSARecvEx =       	_OS2WSARecvEx@16			@1107      	
-   s_perror = 		_OS2s_perror@8				@1108
-
-_OS2gethostname@8                            @2000
+  WSARecvEx                = _OS2WSARecvEx@16                  @1107      	
+  s_perror                 = _OS2s_perror@8                    @1108
