Index: trunk/src/emx/src/lib/socket/herror.c
===================================================================
--- trunk/src/emx/src/lib/socket/herror.c	(revision 352)
+++ trunk/src/emx/src/lib/socket/herror.c	(revision 353)
@@ -1,4 +1,5 @@
 /* herror.c (emx+gcc) -- Copyright (c) 1994 by Eberhard Mattes */
 
+#define TCPV40HDRS
 #include <stdio.h>
 #include <sys/types.h>
Index: trunk/src/emx/src/lib/socket/socket.imp
===================================================================
--- trunk/src/emx/src/lib/socket/socket.imp	(revision 352)
+++ trunk/src/emx/src/lib/socket/socket.imp	(revision 353)
@@ -1,107 +1,3 @@
 ;$Id$
-
-;
-; so32dll.imp (created by emximp)
-;
-; -------- so32dll.lib --------
-tcpip40_accept                  so32dll    1 ?
-tcpip40_bind                    so32dll    2 ?
-tcpip40_connect                 so32dll    3 ?
-tcpip40_gethostid               so32dll    4 ?
-tcpip40_getpeername             so32dll    5 ?
-tcpip40_getsockname             so32dll    6 ?
-tcpip40_getsockopt              so32dll    7 ?
-tcpip40_so_ioctl                so32dll    8 ?
-tcpip40_listen                  so32dll    9 ?
-tcpip40_recv                    so32dll   10 ?
-tcpip40_recvfrom                so32dll   11 ?
-tcpip40_os2_select              so32dll   12 ?
-tcpip40_send                    so32dll   13 ?
-tcpip40_sendto                  so32dll   14 ?
-tcpip40_setsockopt              so32dll   15 ?
-tcpip40_socket                  so32dll   16 ?
-tcpip40_soclose                 so32dll   17 ?
-tcpip40_so_cancel               so32dll   18 ?
-tcpip40_soabort                 so32dll   19 ?
-tcpip40_sock_errno              so32dll   20 ?
-tcpip40_recvmsg                 so32dll   21 ?
-tcpip40_sendmsg                 so32dll   22 ?
-tcpip40_readv                   so32dll   23 ?
-tcpip40_writev                  so32dll   24 ?
-tcpip40_shutdown                so32dll   25 ?
-tcpip40_sock_init               so32dll   26 ?
-tcpip40_addsockettolist         so32dll   27 ?
-tcpip40_removesocketfromlist    so32dll   28 ?
-tcpip40_psock_errno             so32dll   30 ?
-tcpip40_getinetversion          so32dll   31 ?
-tcpip40_bsdselect               so32dll   32 ?
-tcpip40_set_errno               so32dll   35 ?
-tcpip40_getsocketfromlist       so32dll   39 ?
-
-
-;
-; tcp32dll.imp (created by emximp)
-;
-; -------- tcp32dll.lib --------
-tcpip40_settimeofday            tcp32dll   1 ?
-tcpip40_gettimeofday            tcp32dll   2 ?
-tcpip40_lswap                   tcp32dll   3 ?
-tcpip40_bswap                   tcp32dll   4 ?
-tcpip40_inet_addr               tcp32dll   5 ?
-tcpip40_inet_lnaof              tcp32dll   6 ?
-tcpip40_inet_netof              tcp32dll   7 ?
-tcpip40_inet_makeaddr           tcp32dll   8 ?
-tcpip40_inet_network            tcp32dll   9 ?
-tcpip40_inet_ntoa               tcp32dll  10 ?
-tcpip40_gethostbyname           tcp32dll  11 ?
-tcpip40_gethostbyaddr           tcp32dll  12 ?
-tcpip40_getnetbyname            tcp32dll  13 ?
-tcpip40_getnetbyaddr            tcp32dll  14 ?
-tcpip40_setnetent               tcp32dll  15 ?
-tcpip40_endnetent               tcp32dll  16 ?
-tcpip40_getnetent               tcp32dll  17 ?
-tcpip40_setprotoent             tcp32dll  18 ?
-tcpip40_endprotoent             tcp32dll  19 ?
-tcpip40_getprotoent             tcp32dll  20 ?
-tcpip40_getprotobyname          tcp32dll  21 ?
-tcpip40_getprotobynumber        tcp32dll  22 ?
-tcpip40_getservbyport           tcp32dll  23 ?
-tcpip40_getservbyname           tcp32dll  24 ?
-tcpip40_setservent              tcp32dll  25 ?
-tcpip40_endservent              tcp32dll  26 ?
-tcpip40_getservent              tcp32dll  27 ?
-tcpip40_sethostent              tcp32dll  28 ?
-tcpip40_endhostent              tcp32dll  29 ?
-tcpip40_gethostent              tcp32dll  30 ?
-tcpip40_dn_expand               tcp32dll  31 ?
-tcpip40_dn_comp                 tcp32dll  32 ?
-tcpip40_dn_skipname             tcp32dll  33 ?
-tcpip40_dn_find                 tcp32dll  34 ?
-tcpip40__getshort               tcp32dll  35 ?
-tcpip40__getlong                tcp32dll  36 ?
-tcpip40_putshort                tcp32dll  37 ?
-tcpip40_putlong                 tcp32dll  38 ?
-tcpip40_res_init                tcp32dll  39 ?
-tcpip40_res_mkquery             tcp32dll  40 ?
-tcpip40_res_send                tcp32dll  41 ?
-tcpip40_h_errno                 tcp32dll  42 ?
-tcpip40__res                    tcp32dll  43 ?
-tcpip40_gethostname             tcp32dll  44 ?
-tcpip40_rexec                   tcp32dll  45 ?
-tcpip40_gethostbyname_r         tcp32dll  48 ?
-tcpip40_gethostbyaddr_r         tcp32dll  49 ?
-tcpip40_getservbyname_r         tcp32dll  50 ?
-tcpip40_tcp_h_errno             tcp32dll  51 ?
-tcpip40_res_search              tcp32dll  52 ?
-tcpip40_res_query               tcp32dll  53 ?
-tcpip40_res_querydomain         tcp32dll  54 ?
-tcpip40_Raccept                 tcp32dll  56 ?
-tcpip40_Rbind                   tcp32dll  57 ?
-tcpip40_Rconnect                tcp32dll  58 ?
-tcpip40_Rgetsockname            tcp32dll  59 ?
-tcpip40_Rlisten                 tcp32dll  60 ?
-tcpip40_Rgethostbyname          tcp32dll  61 ?
-
-
 
 ;
@@ -110,148 +6,294 @@
 ; -------- tcpip32.lib --------
 accept                  tcpip32    1 ?
+_accept                 tcpip32    1 ?
 bind                    tcpip32    2 ?
+_bind                   tcpip32    2 ?
 connect                 tcpip32    3 ?
+_connect                tcpip32    3 ?
 gethostid               tcpip32    4 ?
+_gethostid              tcpip32    4 ?
 getpeername             tcpip32    5 ?
+_getpeername            tcpip32    5 ?
 getsockname             tcpip32    6 ?
+_getsockname            tcpip32    6 ?
 getsockopt              tcpip32    7 ?
+_getsockopt             tcpip32    7 ?
 so_ioctl                tcpip32    8 ?
+_so_ioctl               tcpip32    8 ?
 listen                  tcpip32    9 ?
+_listen                 tcpip32    9 ?
 recv                    tcpip32   10 ?
+_recv                   tcpip32   10 ?
 recvfrom                tcpip32   11 ?
+_recvfrom               tcpip32   11 ?
 os2_select              tcpip32   12 ?
+_os2_select             tcpip32   12 ?
 send                    tcpip32   13 ?
+_send                   tcpip32   13 ?
 sendto                  tcpip32   14 ?
+_sendto                 tcpip32   14 ?
 setsockopt              tcpip32   15 ?
+_setsockopt             tcpip32   15 ?
 socket                  tcpip32   16 ?
+_socket                 tcpip32   16 ?
 soclose                 tcpip32   17 ?
+_soclose                tcpip32   17 ?
 so_cancel               tcpip32   18 ?
+_so_cancel              tcpip32   18 ?
 soabort                 tcpip32   19 ?
+_soabort                tcpip32   19 ?
 sock_errno              tcpip32   20 ?
+_sock_errno             tcpip32   20 ?
 recvmsg                 tcpip32   21 ?
+_recvmsg                tcpip32   21 ?
 sendmsg                 tcpip32   22 ?
+_sendmsg                tcpip32   22 ?
 so_readv                tcpip32   23 ?
+_so_readv               tcpip32   23 ?
 so_writev               tcpip32   24 ?
+_so_writev              tcpip32   24 ?
 shutdown                tcpip32   25 ?
+_shutdown               tcpip32   25 ?
 sock_init               tcpip32   26 ?
+_sock_init              tcpip32   26 ?
 addsockettolist         tcpip32   27 ?
+_addsockettolist        tcpip32   27 ?
 removesocketfromlist    tcpip32   28 ?
+_removesocketfromlist   tcpip32   28 ?
 cleanupsockets          tcpip32   29 ?
+_cleanupsockets         tcpip32   29 ?
 psock_errno             tcpip32   30 ?
+_psock_errno            tcpip32   30 ?
 getinetversion          tcpip32   31 ?
+_getinetversion         tcpip32   31 ?
 bsdselect               tcpip32   32 ?
+_bsdselect              tcpip32   32 ?
 set_errno               tcpip32   35 ?
+_set_errno              tcpip32   35 ?
 winsockcleanupsockets   tcpip32   38 ?
+_winsockcleanupsockets  tcpip32   38 ?
 gettimeofday            tcpip32  102 ?
+_gettimeofday           tcpip32  102 ?
 inet_addr               tcpip32  105 ?
+_inet_addr              tcpip32  105 ?
 inet_lnaof              tcpip32  106 ?
+_inet_lnaof             tcpip32  106 ?
 inet_netof              tcpip32  107 ?
+_inet_netof             tcpip32  107 ?
 inet_makeaddr           tcpip32  108 ?
+_inet_makeaddr          tcpip32  108 ?
 inet_network            tcpip32  109 ?
+_inet_network           tcpip32  109 ?
 inet_ntoa               tcpip32  110 ?
+_inet_ntoa              tcpip32  110 ?
 gethostbyname           tcpip32  111 ?
+_gethostbyname          tcpip32  111 ?
 gethostbyaddr           tcpip32  112 ?
+_gethostbyaddr          tcpip32  112 ?
 getnetbyname            tcpip32  113 ?
+_getnetbyname           tcpip32  113 ?
 getnetbyaddr            tcpip32  114 ?
+_getnetbyaddr           tcpip32  114 ?
 setnetent               tcpip32  115 ?
+_setnetent              tcpip32  115 ?
 endnetent               tcpip32  116 ?
+_endnetent              tcpip32  116 ?
 getnetent               tcpip32  117 ?
+_getnetent              tcpip32  117 ?
 setprotoent             tcpip32  118 ?
+_setprotoent            tcpip32  118 ?
 endprotoent             tcpip32  119 ?
+_endprotoent            tcpip32  119 ?
 getprotoent             tcpip32  120 ?
+_getprotoent            tcpip32  120 ?
 getprotobyname          tcpip32  121 ?
+_getprotobyname         tcpip32  121 ?
 getprotobynumber        tcpip32  122 ?
+_getprotobynumber       tcpip32  122 ?
 getservbyport           tcpip32  123 ?
+_getservbyport          tcpip32  123 ?
 getservbyname           tcpip32  124 ?
+_getservbyname          tcpip32  124 ?
 setservent              tcpip32  125 ?
+_setservent             tcpip32  125 ?
 endservent              tcpip32  126 ?
+_endservent             tcpip32  126 ?
 getservent              tcpip32  127 ?
+_getservent             tcpip32  127 ?
 sethostent              tcpip32  128 ?
+_sethostent             tcpip32  128 ?
 endhostent              tcpip32  129 ?
+_endhostent             tcpip32  129 ?
 gethostent              tcpip32  130 ?
+_gethostent             tcpip32  130 ?
 __dn_expand             tcpip32  131 ?
+___dn_expand            tcpip32  131 ?
 __dn_comp               tcpip32  132 ?
+___dn_comp              tcpip32  132 ?
 __dn_skipname           tcpip32  133 ?
+___dn_skipname          tcpip32  133 ?
 dn_find                 tcpip32  134 ?
+_dn_find                tcpip32  134 ?
 _getshort               tcpip32  135 ?
+__getshort              tcpip32  135 ?
 _getlong                tcpip32  136 ?
+__getlong               tcpip32  136 ?
 __putshort              tcpip32  137 ?
+___putshort             tcpip32  137 ?
 __putlong               tcpip32  138 ?
+___putlong              tcpip32  138 ?
 __res_init              tcpip32  139 ?
+___res_init             tcpip32  139 ?
 __res_mkquery           tcpip32  140 ?
+___res_mkquery          tcpip32  140 ?
 __res_send              tcpip32  141 ?
+___res_send             tcpip32  141 ?
 _ress                   tcpip32  143 ?
+__ress                  tcpip32  143 ?
 gethostname             tcpip32  144 ?
+_gethostname            tcpip32  144 ?
 rexec                   tcpip32  145 ?
+_rexec                  tcpip32  145 ?
 tcp_h_errno1            tcpip32  151 ?
+_tcp_h_errno1           tcpip32  151 ?
 __res_search            tcpip32  152 ?
+___res_search           tcpip32  152 ?
 __res_query             tcpip32  153 ?
+___res_query            tcpip32  153 ?
 __res_querydomain       tcpip32  154 ?
+___res_querydomain      tcpip32  154 ?
 Raccept                 tcpip32  156 ?
+_Raccept                tcpip32  156 ?
 Rbind                   tcpip32  157 ?
+_Rbind                  tcpip32  157 ?
 Rconnect                tcpip32  158 ?
+_Rconnect               tcpip32  158 ?
 Rgetsockname            tcpip32  159 ?
+_Rgetsockname           tcpip32  159 ?
 Rlisten                 tcpip32  160 ?
+_Rlisten                tcpip32  160 ?
 Rgethostbyname          tcpip32  161 ?
+_Rgethostbyname         tcpip32  161 ?
 os2_ioctl               tcpip32  200 ?
+_os2_ioctl              tcpip32  200 ?
 __TCPFDIsSet            tcpip32  201 ?
+___TCPFDIsSet           tcpip32  201 ?
 conv_sockaddr_parms     tcpip32  202 ?
+_conv_sockaddr_parms    tcpip32  202 ?
 htonl                   tcpip32  203 ?
+_htonl                  tcpip32  203 ?
 ntohl                   tcpip32  204 ?
+_ntohl                  tcpip32  204 ?
 htons                   tcpip32  205 ?
+_htons                  tcpip32  205 ?
 ntohs                   tcpip32  206 ?
+_ntohs                  tcpip32  206 ?
 sysctl                  tcpip32  207 ?
+_sysctl                 tcpip32  207 ?
 herror                  tcpip32  208 ?
+_herror                 tcpip32  208 ?
 hstrerror               tcpip32  209 ?
+_hstrerror              tcpip32  209 ?
 __p_class_syms          tcpip32  211 ?
+___p_class_syms         tcpip32  211 ?
 __p_type_syms           tcpip32  212 ?
+___p_type_syms          tcpip32  212 ?
 __res_hnok              tcpip32  213 ?
+___res_hnok             tcpip32  213 ?
 __res_ownok             tcpip32  214 ?
+___res_ownok            tcpip32  214 ?
 __res_mailok            tcpip32  215 ?
+___res_mailok           tcpip32  215 ?
 __res_dnok              tcpip32  216 ?
+___res_dnok             tcpip32  216 ?
 __sym_ston              tcpip32  217 ?
+___sym_ston             tcpip32  217 ?
 __sym_ntos              tcpip32  218 ?
+___sym_ntos             tcpip32  218 ?
 __sym_ntop              tcpip32  219 ?
+___sym_ntop             tcpip32  219 ?
 __b64_ntop              tcpip32  220 ?
+___b64_ntop             tcpip32  220 ?
 __B64_PTOn              tcpip32  221 ?
+___B64_PTOn             tcpip32  221 ?
 __b64_pton              tcpip32  221 ?
+___b64_pton             tcpip32  221 ?
 __loc_aton              tcpip32  222 ?
+___loc_aton             tcpip32  222 ?
 __loc_ntoa              tcpip32  223 ?
+___loc_ntoa             tcpip32  223 ?
 __fp_resstat            tcpip32  224 ?
+___fp_resstat           tcpip32  224 ?
 __fp_query              tcpip32  225 ?
+___fp_query             tcpip32  225 ?
 __fp_nquery             tcpip32  226 ?
+___fp_nquery            tcpip32  226 ?
 __hostalias             tcpip32  227 ?
+___hostalias            tcpip32  227 ?
 __p_class               tcpip32  228 ?
+___p_class              tcpip32  228 ?
 __p_time                tcpip32  229 ?
+___p_time               tcpip32  229 ?
 __p_type                tcpip32  230 ?
+___p_type               tcpip32  230 ?
 __p_query               tcpip32  231 ?
+___p_query              tcpip32  231 ?
 __p_cdnname             tcpip32  232 ?
+___p_cdnname            tcpip32  232 ?
 __p_cdname              tcpip32  233 ?
+___p_cdname             tcpip32  233 ?
 __p_fqnname             tcpip32  234 ?
+___p_fqnname            tcpip32  234 ?
 __p_fqname              tcpip32  235 ?
+___p_fqname             tcpip32  235 ?
 __p_rr                  tcpip32  236 ?
+___p_rr                 tcpip32  236 ?
 __p_option              tcpip32  237 ?
+___p_option             tcpip32  237 ?
 __p_secstodate          tcpip32  238 ?
+___p_secstodate         tcpip32  238 ?
 __dn_count_labels       tcpip32  239 ?
+___dn_count_labels      tcpip32  239 ?
 __res_randomid          tcpip32  240 ?
+___res_randomid         tcpip32  240 ?
 __res_isourserver       tcpip32  241 ?
+___res_isourserver      tcpip32  241 ?
 __res_nameinquery       tcpip32  242 ?
+___res_nameinquery      tcpip32  242 ?
 __res_queriesmatch      tcpip32  243 ?
+___res_queriesmatch     tcpip32  243 ?
 __res_close             tcpip32  244 ?
+___res_close            tcpip32  244 ?
 gethostbyname2          tcpip32  245 ?
+_gethostbyname2         tcpip32  245 ?
 inet_aton               tcpip32  246 ?
+_inet_aton              tcpip32  246 ?
 inet_neta               tcpip32  247 ?
+_inet_neta              tcpip32  247 ?
 inet_net_ntop           tcpip32  248 ?
+_inet_net_ntop          tcpip32  248 ?
 inet_net_pton           tcpip32  249 ?
+_inet_net_pton          tcpip32  249 ?
 inet_pton               tcpip32  250 ?
+_inet_pton              tcpip32  250 ?
 inet_ntop               tcpip32  251 ?
+_inet_ntop              tcpip32  251 ?
 inet_nsap_addr          tcpip32  252 ?
+_inet_nsap_addr         tcpip32  252 ?
 inet_nsap_ntoa          tcpip32  253 ?
+_inet_nsap_ntoa         tcpip32  253 ?
 socketpair              tcpip32  254 ?
+_socketpair             tcpip32  254 ?
 sock_strerror           tcpip32  255 ?
+_sock_strerror          tcpip32  255 ?
 accept_and_recv         tcpip32  256 ?
+_accept_and_recv        tcpip32  256 ?
 send_file               tcpip32  257 ?
+_send_file              tcpip32  257 ?
 kernchkacc              tcpip32  300 ?
+_kernchkacc             tcpip32  300 ?
 convert16to32bitaddr    tcpip32  301 ?
+_convert16to32bitaddr   tcpip32  301 ?
 socketmain              tcpip32  302 ?
+_socketmain             tcpip32  302 ?
 
Index: trunk/src/emx/src/lib/socket/socket.smak
===================================================================
--- trunk/src/emx/src/lib/socket/socket.smak	(revision 352)
+++ trunk/src/emx/src/lib/socket/socket.smak	(revision 353)
@@ -3,12 +3,13 @@
 .MODULE	:= libsocket
 .MDESC	:= The socket library
-.MDEP   := emxomf emximp
+_MDIRS  := $.aout/tcpipv4 $.aout-prof/tcpipv4
+.MDEP   := emxomf emximp $(_MDIRS)
+TARGDIRS += $(_MDIRS)
 
 .TARGET	:= libsocket_p.a
 .TKIND	:= aout prof
-.TSRC	:= src/lib/socket/herror.c
-.TSRC   += $(wildcard src/lib/socket/386/*.s)
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
 .IMPS   := src/lib/socket/socket.imp
-.INSDIR	= lib/
+.INSDIR	:= lib/
 .TKEEP	:= 1
 include mkimplib.smak
@@ -16,6 +17,33 @@
 .TARGET	:= libsocket.a
 .TKIND	:= aout
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.IMPS   := src/lib/socket/socket.imp
+.INSDIR	:= lib/
+.TKEEP	:= 1
 include mkimplib.smak
+
+	
+.TARGET	:= tcpipv4/libsocket_p.a
+.TKIND	:= aout prof
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.TSRC	+= src/lib/socket/herror.c
+.IMPS   := src/lib/socket/socket_tcpipv4.imp
+.INSDIR	:= lib/
+.TKEEP	:= 1
+include mkimplib.smak
+
+.TARGET	:= tcpipv4/libsocket.a
+.TKIND	:= aout
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.TSRC	+= src/lib/socket/herror.c
+.IMPS   := src/lib/socket/socket_tcpipv4.imp
+.TKEEP	:= 1
+include mkimplib.smak
+
+#$.omf/tcpipv4 omf-prof/tcpipv4
+
 
 # Forget temporary variables
 include comend.smak
+_MDIRS 	:=
+
Index: trunk/src/emx/src/lib/socket/socket_tcpipv4.imp
===================================================================
--- trunk/src/emx/src/lib/socket/socket_tcpipv4.imp	(revision 353)
+++ trunk/src/emx/src/lib/socket/socket_tcpipv4.imp	(revision 353)
@@ -0,0 +1,194 @@
+;$Id$
+
+;
+; so32dll.imp (created by emximp)
+;
+; -------- so32dll.lib --------
+accept                  so32dll    1 ?
+_accept                 so32dll    1 ?
+bind                    so32dll    2 ?
+_bind                   so32dll    2 ?
+connect                 so32dll    3 ?
+_connect                so32dll    3 ?
+gethostid               so32dll    4 ?
+_gethostid              so32dll    4 ?
+getpeername             so32dll    5 ?
+_getpeername            so32dll    5 ?
+getsockname             so32dll    6 ?
+_getsockname            so32dll    6 ?
+getsockopt              so32dll    7 ?
+_getsockopt             so32dll    7 ?
+so_ioctl                so32dll    8 ?
+_so_ioctl               so32dll    8 ?
+listen                  so32dll    9 ?
+_listen                 so32dll    9 ?
+recv                    so32dll   10 ?
+_recv                   so32dll   10 ?
+recvfrom                so32dll   11 ?
+_recvfrom               so32dll   11 ?
+os2_select              so32dll   12 ?
+_os2_select             so32dll   12 ?
+send                    so32dll   13 ?
+_send                   so32dll   13 ?
+sendto                  so32dll   14 ?
+_sendto                 so32dll   14 ?
+setsockopt              so32dll   15 ?
+_setsockopt             so32dll   15 ?
+socket                  so32dll   16 ?
+_socket                 so32dll   16 ?
+soclose                 so32dll   17 ?
+_soclose                so32dll   17 ?
+so_cancel               so32dll   18 ?
+_so_cancel              so32dll   18 ?
+soabort                 so32dll   19 ?
+_soabort                so32dll   19 ?
+sock_errno              so32dll   20 ?
+_sock_errno             so32dll   20 ?
+recvmsg                 so32dll   21 ?
+_recvmsg                so32dll   21 ?
+sendmsg                 so32dll   22 ?
+_sendmsg                so32dll   22 ?
+readv                   so32dll   23 ?
+_readv                  so32dll   23 ?
+writev                  so32dll   24 ?
+_writev                 so32dll   24 ?
+shutdown                so32dll   25 ?
+_shutdown               so32dll   25 ?
+sock_init               so32dll   26 ?
+_sock_init              so32dll   26 ?
+addsockettolist         so32dll   27 ?
+_addsockettolist        so32dll   27 ?
+removesocketfromlist    so32dll   28 ?
+_removesocketfromlist   so32dll   28 ?
+psock_errno             so32dll   30 ?
+_psock_errno            so32dll   30 ?
+getinetversion          so32dll   31 ?
+_getinetversion         so32dll   31 ?
+bsdselect               so32dll   32 ?
+_bsdselect              so32dll   32 ?
+set_errno               so32dll   35 ?
+_set_errno              so32dll   35 ?
+getsocketfromlist       so32dll   39 ?
+_getsocketfromlist      so32dll   39 ?
+
+
+;
+; tcp32dll.imp (created by emximp)
+;
+; -------- tcp32dll.lib --------
+settimeofday            tcp32dll   1 ?
+_settimeofday           tcp32dll   1 ?
+gettimeofday            tcp32dll   2 ?
+_gettimeofday           tcp32dll   2 ?
+lswap                   tcp32dll   3 ?
+_lswap                  tcp32dll   3 ?
+bswap                   tcp32dll   4 ?
+_bswap                  tcp32dll   4 ?
+inet_addr               tcp32dll   5 ?
+_inet_addr              tcp32dll   5 ?
+inet_lnaof              tcp32dll   6 ?
+_inet_lnaof             tcp32dll   6 ?
+inet_netof              tcp32dll   7 ?
+_inet_netof             tcp32dll   7 ?
+inet_makeaddr           tcp32dll   8 ?
+_inet_makeaddr          tcp32dll   8 ?
+inet_network            tcp32dll   9 ?
+_inet_network           tcp32dll   9 ?
+inet_ntoa               tcp32dll  10 ?
+_inet_ntoa              tcp32dll  10 ?
+gethostbyname           tcp32dll  11 ?
+_gethostbyname          tcp32dll  11 ?
+gethostbyaddr           tcp32dll  12 ?
+_gethostbyaddr          tcp32dll  12 ?
+getnetbyname            tcp32dll  13 ?
+_getnetbyname           tcp32dll  13 ?
+getnetbyaddr            tcp32dll  14 ?
+_getnetbyaddr           tcp32dll  14 ?
+setnetent               tcp32dll  15 ?
+_setnetent              tcp32dll  15 ?
+endnetent               tcp32dll  16 ?
+_endnetent              tcp32dll  16 ?
+getnetent               tcp32dll  17 ?
+_getnetent              tcp32dll  17 ?
+setprotoent             tcp32dll  18 ?
+_setprotoent            tcp32dll  18 ?
+endprotoent             tcp32dll  19 ?
+_endprotoent            tcp32dll  19 ?
+getprotoent             tcp32dll  20 ?
+_getprotoent            tcp32dll  20 ?
+getprotobyname          tcp32dll  21 ?
+_getprotobyname         tcp32dll  21 ?
+getprotobynumber        tcp32dll  22 ?
+_getprotobynumber       tcp32dll  22 ?
+getservbyport           tcp32dll  23 ?
+_getservbyport          tcp32dll  23 ?
+getservbyname           tcp32dll  24 ?
+_getservbyname          tcp32dll  24 ?
+setservent              tcp32dll  25 ?
+_setservent             tcp32dll  25 ?
+endservent              tcp32dll  26 ?
+_endservent             tcp32dll  26 ?
+getservent              tcp32dll  27 ?
+_getservent             tcp32dll  27 ?
+sethostent              tcp32dll  28 ?
+_sethostent             tcp32dll  28 ?
+endhostent              tcp32dll  29 ?
+_endhostent             tcp32dll  29 ?
+gethostent              tcp32dll  30 ?
+_gethostent             tcp32dll  30 ?
+dn_expand               tcp32dll  31 ?
+_dn_expand              tcp32dll  31 ?
+dn_comp                 tcp32dll  32 ?
+_dn_comp                tcp32dll  32 ?
+dn_skipname             tcp32dll  33 ?
+_dn_skipname            tcp32dll  33 ?
+dn_find                 tcp32dll  34 ?
+_dn_find                tcp32dll  34 ?
+_getshort               tcp32dll  35 ?
+__getshort              tcp32dll  35 ?
+_getlong                tcp32dll  36 ?
+__getlong               tcp32dll  36 ?
+putshort                tcp32dll  37 ?
+_putshort               tcp32dll  37 ?
+putlong                 tcp32dll  38 ?
+_putlong                tcp32dll  38 ?
+res_init                tcp32dll  39 ?
+_res_init               tcp32dll  39 ?
+res_mkquery             tcp32dll  40 ?
+_res_mkquery            tcp32dll  40 ?
+res_send                tcp32dll  41 ?
+_res_send               tcp32dll  41 ?
+h_errno                 tcp32dll  42 ?
+_h_errno                tcp32dll  42 ?
+_res                    tcp32dll  43 ?
+__res                   tcp32dll  43 ?
+gethostname             tcp32dll  44 ?
+_gethostname            tcp32dll  44 ?
+rexec                   tcp32dll  45 ?
+_rexec                  tcp32dll  45 ?
+gethostbyname_r         tcp32dll  48 ?
+_gethostbyname_r        tcp32dll  48 ?
+gethostbyaddr_r         tcp32dll  49 ?
+_gethostbyaddr_r        tcp32dll  49 ?
+getservbyname_r         tcp32dll  50 ?
+_getservbyname_r        tcp32dll  50 ?
+tcp_h_errno             tcp32dll  51 ?
+_tcp_h_errno            tcp32dll  51 ?
+res_search              tcp32dll  52 ?
+_res_search             tcp32dll  52 ?
+res_query               tcp32dll  53 ?
+_res_query              tcp32dll  53 ?
+res_querydomain         tcp32dll  54 ?
+_res_querydomain        tcp32dll  54 ?
+Raccept                 tcp32dll  56 ?
+_Raccept                tcp32dll  56 ?
+Rbind                   tcp32dll  57 ?
+_Rbind                  tcp32dll  57 ?
+Rconnect                tcp32dll  58 ?
+_Rconnect               tcp32dll  58 ?
+Rgetsockname            tcp32dll  59 ?
+_Rgetsockname           tcp32dll  59 ?
+Rlisten                 tcp32dll  60 ?
+_Rlisten                tcp32dll  60 ?
+Rgethostbyname          tcp32dll  61 ?
+_Rgethostbyname         tcp32dll  61 ?
Index: trunk/src/emx/src/libsocket/herror.c
===================================================================
--- trunk/src/emx/src/libsocket/herror.c	(revision 352)
+++ trunk/src/emx/src/libsocket/herror.c	(revision 353)
@@ -1,4 +1,5 @@
 /* herror.c (emx+gcc) -- Copyright (c) 1994 by Eberhard Mattes */
 
+#define TCPV40HDRS
 #include <stdio.h>
 #include <sys/types.h>
Index: trunk/src/emx/src/libsocket/socket.imp
===================================================================
--- trunk/src/emx/src/libsocket/socket.imp	(revision 352)
+++ trunk/src/emx/src/libsocket/socket.imp	(revision 353)
@@ -1,107 +1,3 @@
 ;$Id$
-
-;
-; so32dll.imp (created by emximp)
-;
-; -------- so32dll.lib --------
-tcpip40_accept                  so32dll    1 ?
-tcpip40_bind                    so32dll    2 ?
-tcpip40_connect                 so32dll    3 ?
-tcpip40_gethostid               so32dll    4 ?
-tcpip40_getpeername             so32dll    5 ?
-tcpip40_getsockname             so32dll    6 ?
-tcpip40_getsockopt              so32dll    7 ?
-tcpip40_so_ioctl                so32dll    8 ?
-tcpip40_listen                  so32dll    9 ?
-tcpip40_recv                    so32dll   10 ?
-tcpip40_recvfrom                so32dll   11 ?
-tcpip40_os2_select              so32dll   12 ?
-tcpip40_send                    so32dll   13 ?
-tcpip40_sendto                  so32dll   14 ?
-tcpip40_setsockopt              so32dll   15 ?
-tcpip40_socket                  so32dll   16 ?
-tcpip40_soclose                 so32dll   17 ?
-tcpip40_so_cancel               so32dll   18 ?
-tcpip40_soabort                 so32dll   19 ?
-tcpip40_sock_errno              so32dll   20 ?
-tcpip40_recvmsg                 so32dll   21 ?
-tcpip40_sendmsg                 so32dll   22 ?
-tcpip40_readv                   so32dll   23 ?
-tcpip40_writev                  so32dll   24 ?
-tcpip40_shutdown                so32dll   25 ?
-tcpip40_sock_init               so32dll   26 ?
-tcpip40_addsockettolist         so32dll   27 ?
-tcpip40_removesocketfromlist    so32dll   28 ?
-tcpip40_psock_errno             so32dll   30 ?
-tcpip40_getinetversion          so32dll   31 ?
-tcpip40_bsdselect               so32dll   32 ?
-tcpip40_set_errno               so32dll   35 ?
-tcpip40_getsocketfromlist       so32dll   39 ?
-
-
-;
-; tcp32dll.imp (created by emximp)
-;
-; -------- tcp32dll.lib --------
-tcpip40_settimeofday            tcp32dll   1 ?
-tcpip40_gettimeofday            tcp32dll   2 ?
-tcpip40_lswap                   tcp32dll   3 ?
-tcpip40_bswap                   tcp32dll   4 ?
-tcpip40_inet_addr               tcp32dll   5 ?
-tcpip40_inet_lnaof              tcp32dll   6 ?
-tcpip40_inet_netof              tcp32dll   7 ?
-tcpip40_inet_makeaddr           tcp32dll   8 ?
-tcpip40_inet_network            tcp32dll   9 ?
-tcpip40_inet_ntoa               tcp32dll  10 ?
-tcpip40_gethostbyname           tcp32dll  11 ?
-tcpip40_gethostbyaddr           tcp32dll  12 ?
-tcpip40_getnetbyname            tcp32dll  13 ?
-tcpip40_getnetbyaddr            tcp32dll  14 ?
-tcpip40_setnetent               tcp32dll  15 ?
-tcpip40_endnetent               tcp32dll  16 ?
-tcpip40_getnetent               tcp32dll  17 ?
-tcpip40_setprotoent             tcp32dll  18 ?
-tcpip40_endprotoent             tcp32dll  19 ?
-tcpip40_getprotoent             tcp32dll  20 ?
-tcpip40_getprotobyname          tcp32dll  21 ?
-tcpip40_getprotobynumber        tcp32dll  22 ?
-tcpip40_getservbyport           tcp32dll  23 ?
-tcpip40_getservbyname           tcp32dll  24 ?
-tcpip40_setservent              tcp32dll  25 ?
-tcpip40_endservent              tcp32dll  26 ?
-tcpip40_getservent              tcp32dll  27 ?
-tcpip40_sethostent              tcp32dll  28 ?
-tcpip40_endhostent              tcp32dll  29 ?
-tcpip40_gethostent              tcp32dll  30 ?
-tcpip40_dn_expand               tcp32dll  31 ?
-tcpip40_dn_comp                 tcp32dll  32 ?
-tcpip40_dn_skipname             tcp32dll  33 ?
-tcpip40_dn_find                 tcp32dll  34 ?
-tcpip40__getshort               tcp32dll  35 ?
-tcpip40__getlong                tcp32dll  36 ?
-tcpip40_putshort                tcp32dll  37 ?
-tcpip40_putlong                 tcp32dll  38 ?
-tcpip40_res_init                tcp32dll  39 ?
-tcpip40_res_mkquery             tcp32dll  40 ?
-tcpip40_res_send                tcp32dll  41 ?
-tcpip40_h_errno                 tcp32dll  42 ?
-tcpip40__res                    tcp32dll  43 ?
-tcpip40_gethostname             tcp32dll  44 ?
-tcpip40_rexec                   tcp32dll  45 ?
-tcpip40_gethostbyname_r         tcp32dll  48 ?
-tcpip40_gethostbyaddr_r         tcp32dll  49 ?
-tcpip40_getservbyname_r         tcp32dll  50 ?
-tcpip40_tcp_h_errno             tcp32dll  51 ?
-tcpip40_res_search              tcp32dll  52 ?
-tcpip40_res_query               tcp32dll  53 ?
-tcpip40_res_querydomain         tcp32dll  54 ?
-tcpip40_Raccept                 tcp32dll  56 ?
-tcpip40_Rbind                   tcp32dll  57 ?
-tcpip40_Rconnect                tcp32dll  58 ?
-tcpip40_Rgetsockname            tcp32dll  59 ?
-tcpip40_Rlisten                 tcp32dll  60 ?
-tcpip40_Rgethostbyname          tcp32dll  61 ?
-
-
 
 ;
@@ -110,148 +6,294 @@
 ; -------- tcpip32.lib --------
 accept                  tcpip32    1 ?
+_accept                 tcpip32    1 ?
 bind                    tcpip32    2 ?
+_bind                   tcpip32    2 ?
 connect                 tcpip32    3 ?
+_connect                tcpip32    3 ?
 gethostid               tcpip32    4 ?
+_gethostid              tcpip32    4 ?
 getpeername             tcpip32    5 ?
+_getpeername            tcpip32    5 ?
 getsockname             tcpip32    6 ?
+_getsockname            tcpip32    6 ?
 getsockopt              tcpip32    7 ?
+_getsockopt             tcpip32    7 ?
 so_ioctl                tcpip32    8 ?
+_so_ioctl               tcpip32    8 ?
 listen                  tcpip32    9 ?
+_listen                 tcpip32    9 ?
 recv                    tcpip32   10 ?
+_recv                   tcpip32   10 ?
 recvfrom                tcpip32   11 ?
+_recvfrom               tcpip32   11 ?
 os2_select              tcpip32   12 ?
+_os2_select             tcpip32   12 ?
 send                    tcpip32   13 ?
+_send                   tcpip32   13 ?
 sendto                  tcpip32   14 ?
+_sendto                 tcpip32   14 ?
 setsockopt              tcpip32   15 ?
+_setsockopt             tcpip32   15 ?
 socket                  tcpip32   16 ?
+_socket                 tcpip32   16 ?
 soclose                 tcpip32   17 ?
+_soclose                tcpip32   17 ?
 so_cancel               tcpip32   18 ?
+_so_cancel              tcpip32   18 ?
 soabort                 tcpip32   19 ?
+_soabort                tcpip32   19 ?
 sock_errno              tcpip32   20 ?
+_sock_errno             tcpip32   20 ?
 recvmsg                 tcpip32   21 ?
+_recvmsg                tcpip32   21 ?
 sendmsg                 tcpip32   22 ?
+_sendmsg                tcpip32   22 ?
 so_readv                tcpip32   23 ?
+_so_readv               tcpip32   23 ?
 so_writev               tcpip32   24 ?
+_so_writev              tcpip32   24 ?
 shutdown                tcpip32   25 ?
+_shutdown               tcpip32   25 ?
 sock_init               tcpip32   26 ?
+_sock_init              tcpip32   26 ?
 addsockettolist         tcpip32   27 ?
+_addsockettolist        tcpip32   27 ?
 removesocketfromlist    tcpip32   28 ?
+_removesocketfromlist   tcpip32   28 ?
 cleanupsockets          tcpip32   29 ?
+_cleanupsockets         tcpip32   29 ?
 psock_errno             tcpip32   30 ?
+_psock_errno            tcpip32   30 ?
 getinetversion          tcpip32   31 ?
+_getinetversion         tcpip32   31 ?
 bsdselect               tcpip32   32 ?
+_bsdselect              tcpip32   32 ?
 set_errno               tcpip32   35 ?
+_set_errno              tcpip32   35 ?
 winsockcleanupsockets   tcpip32   38 ?
+_winsockcleanupsockets  tcpip32   38 ?
 gettimeofday            tcpip32  102 ?
+_gettimeofday           tcpip32  102 ?
 inet_addr               tcpip32  105 ?
+_inet_addr              tcpip32  105 ?
 inet_lnaof              tcpip32  106 ?
+_inet_lnaof             tcpip32  106 ?
 inet_netof              tcpip32  107 ?
+_inet_netof             tcpip32  107 ?
 inet_makeaddr           tcpip32  108 ?
+_inet_makeaddr          tcpip32  108 ?
 inet_network            tcpip32  109 ?
+_inet_network           tcpip32  109 ?
 inet_ntoa               tcpip32  110 ?
+_inet_ntoa              tcpip32  110 ?
 gethostbyname           tcpip32  111 ?
+_gethostbyname          tcpip32  111 ?
 gethostbyaddr           tcpip32  112 ?
+_gethostbyaddr          tcpip32  112 ?
 getnetbyname            tcpip32  113 ?
+_getnetbyname           tcpip32  113 ?
 getnetbyaddr            tcpip32  114 ?
+_getnetbyaddr           tcpip32  114 ?
 setnetent               tcpip32  115 ?
+_setnetent              tcpip32  115 ?
 endnetent               tcpip32  116 ?
+_endnetent              tcpip32  116 ?
 getnetent               tcpip32  117 ?
+_getnetent              tcpip32  117 ?
 setprotoent             tcpip32  118 ?
+_setprotoent            tcpip32  118 ?
 endprotoent             tcpip32  119 ?
+_endprotoent            tcpip32  119 ?
 getprotoent             tcpip32  120 ?
+_getprotoent            tcpip32  120 ?
 getprotobyname          tcpip32  121 ?
+_getprotobyname         tcpip32  121 ?
 getprotobynumber        tcpip32  122 ?
+_getprotobynumber       tcpip32  122 ?
 getservbyport           tcpip32  123 ?
+_getservbyport          tcpip32  123 ?
 getservbyname           tcpip32  124 ?
+_getservbyname          tcpip32  124 ?
 setservent              tcpip32  125 ?
+_setservent             tcpip32  125 ?
 endservent              tcpip32  126 ?
+_endservent             tcpip32  126 ?
 getservent              tcpip32  127 ?
+_getservent             tcpip32  127 ?
 sethostent              tcpip32  128 ?
+_sethostent             tcpip32  128 ?
 endhostent              tcpip32  129 ?
+_endhostent             tcpip32  129 ?
 gethostent              tcpip32  130 ?
+_gethostent             tcpip32  130 ?
 __dn_expand             tcpip32  131 ?
+___dn_expand            tcpip32  131 ?
 __dn_comp               tcpip32  132 ?
+___dn_comp              tcpip32  132 ?
 __dn_skipname           tcpip32  133 ?
+___dn_skipname          tcpip32  133 ?
 dn_find                 tcpip32  134 ?
+_dn_find                tcpip32  134 ?
 _getshort               tcpip32  135 ?
+__getshort              tcpip32  135 ?
 _getlong                tcpip32  136 ?
+__getlong               tcpip32  136 ?
 __putshort              tcpip32  137 ?
+___putshort             tcpip32  137 ?
 __putlong               tcpip32  138 ?
+___putlong              tcpip32  138 ?
 __res_init              tcpip32  139 ?
+___res_init             tcpip32  139 ?
 __res_mkquery           tcpip32  140 ?
+___res_mkquery          tcpip32  140 ?
 __res_send              tcpip32  141 ?
+___res_send             tcpip32  141 ?
 _ress                   tcpip32  143 ?
+__ress                  tcpip32  143 ?
 gethostname             tcpip32  144 ?
+_gethostname            tcpip32  144 ?
 rexec                   tcpip32  145 ?
+_rexec                  tcpip32  145 ?
 tcp_h_errno1            tcpip32  151 ?
+_tcp_h_errno1           tcpip32  151 ?
 __res_search            tcpip32  152 ?
+___res_search           tcpip32  152 ?
 __res_query             tcpip32  153 ?
+___res_query            tcpip32  153 ?
 __res_querydomain       tcpip32  154 ?
+___res_querydomain      tcpip32  154 ?
 Raccept                 tcpip32  156 ?
+_Raccept                tcpip32  156 ?
 Rbind                   tcpip32  157 ?
+_Rbind                  tcpip32  157 ?
 Rconnect                tcpip32  158 ?
+_Rconnect               tcpip32  158 ?
 Rgetsockname            tcpip32  159 ?
+_Rgetsockname           tcpip32  159 ?
 Rlisten                 tcpip32  160 ?
+_Rlisten                tcpip32  160 ?
 Rgethostbyname          tcpip32  161 ?
+_Rgethostbyname         tcpip32  161 ?
 os2_ioctl               tcpip32  200 ?
+_os2_ioctl              tcpip32  200 ?
 __TCPFDIsSet            tcpip32  201 ?
+___TCPFDIsSet           tcpip32  201 ?
 conv_sockaddr_parms     tcpip32  202 ?
+_conv_sockaddr_parms    tcpip32  202 ?
 htonl                   tcpip32  203 ?
+_htonl                  tcpip32  203 ?
 ntohl                   tcpip32  204 ?
+_ntohl                  tcpip32  204 ?
 htons                   tcpip32  205 ?
+_htons                  tcpip32  205 ?
 ntohs                   tcpip32  206 ?
+_ntohs                  tcpip32  206 ?
 sysctl                  tcpip32  207 ?
+_sysctl                 tcpip32  207 ?
 herror                  tcpip32  208 ?
+_herror                 tcpip32  208 ?
 hstrerror               tcpip32  209 ?
+_hstrerror              tcpip32  209 ?
 __p_class_syms          tcpip32  211 ?
+___p_class_syms         tcpip32  211 ?
 __p_type_syms           tcpip32  212 ?
+___p_type_syms          tcpip32  212 ?
 __res_hnok              tcpip32  213 ?
+___res_hnok             tcpip32  213 ?
 __res_ownok             tcpip32  214 ?
+___res_ownok            tcpip32  214 ?
 __res_mailok            tcpip32  215 ?
+___res_mailok           tcpip32  215 ?
 __res_dnok              tcpip32  216 ?
+___res_dnok             tcpip32  216 ?
 __sym_ston              tcpip32  217 ?
+___sym_ston             tcpip32  217 ?
 __sym_ntos              tcpip32  218 ?
+___sym_ntos             tcpip32  218 ?
 __sym_ntop              tcpip32  219 ?
+___sym_ntop             tcpip32  219 ?
 __b64_ntop              tcpip32  220 ?
+___b64_ntop             tcpip32  220 ?
 __B64_PTOn              tcpip32  221 ?
+___B64_PTOn             tcpip32  221 ?
 __b64_pton              tcpip32  221 ?
+___b64_pton             tcpip32  221 ?
 __loc_aton              tcpip32  222 ?
+___loc_aton             tcpip32  222 ?
 __loc_ntoa              tcpip32  223 ?
+___loc_ntoa             tcpip32  223 ?
 __fp_resstat            tcpip32  224 ?
+___fp_resstat           tcpip32  224 ?
 __fp_query              tcpip32  225 ?
+___fp_query             tcpip32  225 ?
 __fp_nquery             tcpip32  226 ?
+___fp_nquery            tcpip32  226 ?
 __hostalias             tcpip32  227 ?
+___hostalias            tcpip32  227 ?
 __p_class               tcpip32  228 ?
+___p_class              tcpip32  228 ?
 __p_time                tcpip32  229 ?
+___p_time               tcpip32  229 ?
 __p_type                tcpip32  230 ?
+___p_type               tcpip32  230 ?
 __p_query               tcpip32  231 ?
+___p_query              tcpip32  231 ?
 __p_cdnname             tcpip32  232 ?
+___p_cdnname            tcpip32  232 ?
 __p_cdname              tcpip32  233 ?
+___p_cdname             tcpip32  233 ?
 __p_fqnname             tcpip32  234 ?
+___p_fqnname            tcpip32  234 ?
 __p_fqname              tcpip32  235 ?
+___p_fqname             tcpip32  235 ?
 __p_rr                  tcpip32  236 ?
+___p_rr                 tcpip32  236 ?
 __p_option              tcpip32  237 ?
+___p_option             tcpip32  237 ?
 __p_secstodate          tcpip32  238 ?
+___p_secstodate         tcpip32  238 ?
 __dn_count_labels       tcpip32  239 ?
+___dn_count_labels      tcpip32  239 ?
 __res_randomid          tcpip32  240 ?
+___res_randomid         tcpip32  240 ?
 __res_isourserver       tcpip32  241 ?
+___res_isourserver      tcpip32  241 ?
 __res_nameinquery       tcpip32  242 ?
+___res_nameinquery      tcpip32  242 ?
 __res_queriesmatch      tcpip32  243 ?
+___res_queriesmatch     tcpip32  243 ?
 __res_close             tcpip32  244 ?
+___res_close            tcpip32  244 ?
 gethostbyname2          tcpip32  245 ?
+_gethostbyname2         tcpip32  245 ?
 inet_aton               tcpip32  246 ?
+_inet_aton              tcpip32  246 ?
 inet_neta               tcpip32  247 ?
+_inet_neta              tcpip32  247 ?
 inet_net_ntop           tcpip32  248 ?
+_inet_net_ntop          tcpip32  248 ?
 inet_net_pton           tcpip32  249 ?
+_inet_net_pton          tcpip32  249 ?
 inet_pton               tcpip32  250 ?
+_inet_pton              tcpip32  250 ?
 inet_ntop               tcpip32  251 ?
+_inet_ntop              tcpip32  251 ?
 inet_nsap_addr          tcpip32  252 ?
+_inet_nsap_addr         tcpip32  252 ?
 inet_nsap_ntoa          tcpip32  253 ?
+_inet_nsap_ntoa         tcpip32  253 ?
 socketpair              tcpip32  254 ?
+_socketpair             tcpip32  254 ?
 sock_strerror           tcpip32  255 ?
+_sock_strerror          tcpip32  255 ?
 accept_and_recv         tcpip32  256 ?
+_accept_and_recv        tcpip32  256 ?
 send_file               tcpip32  257 ?
+_send_file              tcpip32  257 ?
 kernchkacc              tcpip32  300 ?
+_kernchkacc             tcpip32  300 ?
 convert16to32bitaddr    tcpip32  301 ?
+_convert16to32bitaddr   tcpip32  301 ?
 socketmain              tcpip32  302 ?
+_socketmain             tcpip32  302 ?
 
Index: trunk/src/emx/src/libsocket/socket.smak
===================================================================
--- trunk/src/emx/src/libsocket/socket.smak	(revision 352)
+++ trunk/src/emx/src/libsocket/socket.smak	(revision 353)
@@ -3,12 +3,13 @@
 .MODULE	:= libsocket
 .MDESC	:= The socket library
-.MDEP   := emxomf emximp
+_MDIRS  := $.aout/tcpipv4 $.aout-prof/tcpipv4
+.MDEP   := emxomf emximp $(_MDIRS)
+TARGDIRS += $(_MDIRS)
 
 .TARGET	:= libsocket_p.a
 .TKIND	:= aout prof
-.TSRC	:= src/lib/socket/herror.c
-.TSRC   += $(wildcard src/lib/socket/386/*.s)
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
 .IMPS   := src/lib/socket/socket.imp
-.INSDIR	= lib/
+.INSDIR	:= lib/
 .TKEEP	:= 1
 include mkimplib.smak
@@ -16,6 +17,33 @@
 .TARGET	:= libsocket.a
 .TKIND	:= aout
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.IMPS   := src/lib/socket/socket.imp
+.INSDIR	:= lib/
+.TKEEP	:= 1
 include mkimplib.smak
+
+	
+.TARGET	:= tcpipv4/libsocket_p.a
+.TKIND	:= aout prof
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.TSRC	+= src/lib/socket/herror.c
+.IMPS   := src/lib/socket/socket_tcpipv4.imp
+.INSDIR	:= lib/
+.TKEEP	:= 1
+include mkimplib.smak
+
+.TARGET	:= tcpipv4/libsocket.a
+.TKIND	:= aout
+.TSRC   := $(wildcard src/lib/socket/386/*.s)
+.TSRC	+= src/lib/socket/herror.c
+.IMPS   := src/lib/socket/socket_tcpipv4.imp
+.TKEEP	:= 1
+include mkimplib.smak
+
+#$.omf/tcpipv4 omf-prof/tcpipv4
+
 
 # Forget temporary variables
 include comend.smak
+_MDIRS 	:=
+
Index: trunk/src/emx/src/libsocket/socket_tcpipv4.imp
===================================================================
--- trunk/src/emx/src/libsocket/socket_tcpipv4.imp	(revision 353)
+++ trunk/src/emx/src/libsocket/socket_tcpipv4.imp	(revision 353)
@@ -0,0 +1,194 @@
+;$Id$
+
+;
+; so32dll.imp (created by emximp)
+;
+; -------- so32dll.lib --------
+accept                  so32dll    1 ?
+_accept                 so32dll    1 ?
+bind                    so32dll    2 ?
+_bind                   so32dll    2 ?
+connect                 so32dll    3 ?
+_connect                so32dll    3 ?
+gethostid               so32dll    4 ?
+_gethostid              so32dll    4 ?
+getpeername             so32dll    5 ?
+_getpeername            so32dll    5 ?
+getsockname             so32dll    6 ?
+_getsockname            so32dll    6 ?
+getsockopt              so32dll    7 ?
+_getsockopt             so32dll    7 ?
+so_ioctl                so32dll    8 ?
+_so_ioctl               so32dll    8 ?
+listen                  so32dll    9 ?
+_listen                 so32dll    9 ?
+recv                    so32dll   10 ?
+_recv                   so32dll   10 ?
+recvfrom                so32dll   11 ?
+_recvfrom               so32dll   11 ?
+os2_select              so32dll   12 ?
+_os2_select             so32dll   12 ?
+send                    so32dll   13 ?
+_send                   so32dll   13 ?
+sendto                  so32dll   14 ?
+_sendto                 so32dll   14 ?
+setsockopt              so32dll   15 ?
+_setsockopt             so32dll   15 ?
+socket                  so32dll   16 ?
+_socket                 so32dll   16 ?
+soclose                 so32dll   17 ?
+_soclose                so32dll   17 ?
+so_cancel               so32dll   18 ?
+_so_cancel              so32dll   18 ?
+soabort                 so32dll   19 ?
+_soabort                so32dll   19 ?
+sock_errno              so32dll   20 ?
+_sock_errno             so32dll   20 ?
+recvmsg                 so32dll   21 ?
+_recvmsg                so32dll   21 ?
+sendmsg                 so32dll   22 ?
+_sendmsg                so32dll   22 ?
+readv                   so32dll   23 ?
+_readv                  so32dll   23 ?
+writev                  so32dll   24 ?
+_writev                 so32dll   24 ?
+shutdown                so32dll   25 ?
+_shutdown               so32dll   25 ?
+sock_init               so32dll   26 ?
+_sock_init              so32dll   26 ?
+addsockettolist         so32dll   27 ?
+_addsockettolist        so32dll   27 ?
+removesocketfromlist    so32dll   28 ?
+_removesocketfromlist   so32dll   28 ?
+psock_errno             so32dll   30 ?
+_psock_errno            so32dll   30 ?
+getinetversion          so32dll   31 ?
+_getinetversion         so32dll   31 ?
+bsdselect               so32dll   32 ?
+_bsdselect              so32dll   32 ?
+set_errno               so32dll   35 ?
+_set_errno              so32dll   35 ?
+getsocketfromlist       so32dll   39 ?
+_getsocketfromlist      so32dll   39 ?
+
+
+;
+; tcp32dll.imp (created by emximp)
+;
+; -------- tcp32dll.lib --------
+settimeofday            tcp32dll   1 ?
+_settimeofday           tcp32dll   1 ?
+gettimeofday            tcp32dll   2 ?
+_gettimeofday           tcp32dll   2 ?
+lswap                   tcp32dll   3 ?
+_lswap                  tcp32dll   3 ?
+bswap                   tcp32dll   4 ?
+_bswap                  tcp32dll   4 ?
+inet_addr               tcp32dll   5 ?
+_inet_addr              tcp32dll   5 ?
+inet_lnaof              tcp32dll   6 ?
+_inet_lnaof             tcp32dll   6 ?
+inet_netof              tcp32dll   7 ?
+_inet_netof             tcp32dll   7 ?
+inet_makeaddr           tcp32dll   8 ?
+_inet_makeaddr          tcp32dll   8 ?
+inet_network            tcp32dll   9 ?
+_inet_network           tcp32dll   9 ?
+inet_ntoa               tcp32dll  10 ?
+_inet_ntoa              tcp32dll  10 ?
+gethostbyname           tcp32dll  11 ?
+_gethostbyname          tcp32dll  11 ?
+gethostbyaddr           tcp32dll  12 ?
+_gethostbyaddr          tcp32dll  12 ?
+getnetbyname            tcp32dll  13 ?
+_getnetbyname           tcp32dll  13 ?
+getnetbyaddr            tcp32dll  14 ?
+_getnetbyaddr           tcp32dll  14 ?
+setnetent               tcp32dll  15 ?
+_setnetent              tcp32dll  15 ?
+endnetent               tcp32dll  16 ?
+_endnetent              tcp32dll  16 ?
+getnetent               tcp32dll  17 ?
+_getnetent              tcp32dll  17 ?
+setprotoent             tcp32dll  18 ?
+_setprotoent            tcp32dll  18 ?
+endprotoent             tcp32dll  19 ?
+_endprotoent            tcp32dll  19 ?
+getprotoent             tcp32dll  20 ?
+_getprotoent            tcp32dll  20 ?
+getprotobyname          tcp32dll  21 ?
+_getprotobyname         tcp32dll  21 ?
+getprotobynumber        tcp32dll  22 ?
+_getprotobynumber       tcp32dll  22 ?
+getservbyport           tcp32dll  23 ?
+_getservbyport          tcp32dll  23 ?
+getservbyname           tcp32dll  24 ?
+_getservbyname          tcp32dll  24 ?
+setservent              tcp32dll  25 ?
+_setservent             tcp32dll  25 ?
+endservent              tcp32dll  26 ?
+_endservent             tcp32dll  26 ?
+getservent              tcp32dll  27 ?
+_getservent             tcp32dll  27 ?
+sethostent              tcp32dll  28 ?
+_sethostent             tcp32dll  28 ?
+endhostent              tcp32dll  29 ?
+_endhostent             tcp32dll  29 ?
+gethostent              tcp32dll  30 ?
+_gethostent             tcp32dll  30 ?
+dn_expand               tcp32dll  31 ?
+_dn_expand              tcp32dll  31 ?
+dn_comp                 tcp32dll  32 ?
+_dn_comp                tcp32dll  32 ?
+dn_skipname             tcp32dll  33 ?
+_dn_skipname            tcp32dll  33 ?
+dn_find                 tcp32dll  34 ?
+_dn_find                tcp32dll  34 ?
+_getshort               tcp32dll  35 ?
+__getshort              tcp32dll  35 ?
+_getlong                tcp32dll  36 ?
+__getlong               tcp32dll  36 ?
+putshort                tcp32dll  37 ?
+_putshort               tcp32dll  37 ?
+putlong                 tcp32dll  38 ?
+_putlong                tcp32dll  38 ?
+res_init                tcp32dll  39 ?
+_res_init               tcp32dll  39 ?
+res_mkquery             tcp32dll  40 ?
+_res_mkquery            tcp32dll  40 ?
+res_send                tcp32dll  41 ?
+_res_send               tcp32dll  41 ?
+h_errno                 tcp32dll  42 ?
+_h_errno                tcp32dll  42 ?
+_res                    tcp32dll  43 ?
+__res                   tcp32dll  43 ?
+gethostname             tcp32dll  44 ?
+_gethostname            tcp32dll  44 ?
+rexec                   tcp32dll  45 ?
+_rexec                  tcp32dll  45 ?
+gethostbyname_r         tcp32dll  48 ?
+_gethostbyname_r        tcp32dll  48 ?
+gethostbyaddr_r         tcp32dll  49 ?
+_gethostbyaddr_r        tcp32dll  49 ?
+getservbyname_r         tcp32dll  50 ?
+_getservbyname_r        tcp32dll  50 ?
+tcp_h_errno             tcp32dll  51 ?
+_tcp_h_errno            tcp32dll  51 ?
+res_search              tcp32dll  52 ?
+_res_search             tcp32dll  52 ?
+res_query               tcp32dll  53 ?
+_res_query              tcp32dll  53 ?
+res_querydomain         tcp32dll  54 ?
+_res_querydomain        tcp32dll  54 ?
+Raccept                 tcp32dll  56 ?
+_Raccept                tcp32dll  56 ?
+Rbind                   tcp32dll  57 ?
+_Rbind                  tcp32dll  57 ?
+Rconnect                tcp32dll  58 ?
+_Rconnect               tcp32dll  58 ?
+Rgetsockname            tcp32dll  59 ?
+_Rgetsockname           tcp32dll  59 ?
+Rlisten                 tcp32dll  60 ?
+_Rlisten                tcp32dll  60 ?
+Rgethostbyname          tcp32dll  61 ?
+_Rgethostbyname         tcp32dll  61 ?
