Changeset 2004

Timestamp:

Jun 12, 2005, 1:02:16 AM (20 years ago)

Author:

bird

Message:

fixing tcpip link errors.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/tcpip.h (modified) (1 diff, 1 prop)
• src/lib/startup/startup.smak (modified) (1 diff, 1 prop)
• src/libsocket/socket.c (modified) (1 diff, 1 prop)
• src/libsocket/socket_tcpipv4.imp (modified) (1 diff, 1 prop)

trunk/src/emx/include/InnoTekLIBC/tcpip.h

@@ -149 +149 @@
 /** @defgroup libsocket_renamed     Renamed Imports.
  * @{ */
-int     TCPCALL __libsocket_accept(int, struct sockaddr *, int *);
-int     TCPCALL __libsocket_bind(int, __const__ struct sockaddr *, int);
-int     TCPCALL __libsocket_connect(int, __const__ struct sockaddr *, int);
-int     TCPCALL __libsocket_getpeername(int, struct sockaddr *, int *);
-int     TCPCALL __libsocket_getsockname(int, struct sockaddr *, int *);
-int     TCPCALL __libsocket_getsockopt(int, int, int, void *, int *);
-int     TCPCALL __libsocket_ioctl(int, int, char *);
-int     TCPCALL __libsocket_listen(int, int);
-int     TCPCALL __libsocket_os2_ioctl(int, unsigned long, char *, int);
-int     TCPCALL __libsocket_os2_select(int *, int, int, int, long);
-int     TCPCALL __libsocket_recv(int, void *, int, int);
-int     TCPCALL __libsocket_recvfrom(int, void *, int, int, struct sockaddr *, int *);
-int     TCPCALL __libsocket_recvmsg(int, struct msghdr *, int);
-int     TCPCALL __libsocket_send(int, const void *, int, int);
-int     TCPCALL __libsocket_sendmsg(int, __const__ struct msghdr *, int);
-int     TCPCALL __libsocket_sendto(int, __const__ void *, int, int, __const__ struct sockaddr *, int);
-int     TCPCALL __libsocket_setsockopt(int, int, int, __const__ void *, int);
-int     TCPCALL __libsocket_shutdown(int, int);
-int     TCPCALL __libsocket_sock_errno(void);
-int     TCPCALL __libsocket_socket(int, int, int);
-int     TCPCALL __libsocket_socketpair(int, int, int, int *);
-int     TCPCALL __libsocket_soclose(int);
-int     TCPCALL __libsocket_accept_and_recv(long, long*, struct sockaddr *, long*, struct sockaddr*, long*, caddr_t, size_t);
-void    TCPCALL __libsocket_addsockettolist(int);
-int     TCPCALL __libsocket_removesocketfromlist(int);
-ssize_t TCPCALL __libsocket_so_readv(int, struct iovec *, int);
-ssize_t TCPCALL __libsocket_so_writev(int, struct iovec *, int);
-int     TCPCALL __libsocket_so_cancel(int);
-int     TCPCALL __libsocket_soabort(int);
-int     TCPCALL __libsocket_Raccept(int, struct sockaddr *, int *);
+int     _System __libsocket_accept(int, struct sockaddr *, int *);
+int     _System __libsocket_bind(int, __const__ struct sockaddr *, int);
+int     _System __libsocket_connect(int, __const__ struct sockaddr *, int);
+int     _System __libsocket_getpeername(int, struct sockaddr *, int *);
+int     _System __libsocket_getsockname(int, struct sockaddr *, int *);
+int     _System __libsocket_getsockopt(int, int, int, void *, int *);
+int     _System __libsocket_ioctl(int, int, char *);
+int     _System __libsocket_listen(int, int);
+int     _System __libsocket_os2_ioctl(int, unsigned long, char *, int);
+int     _System __libsocket_os2_select(int *, int, int, int, long);
+int     _System __libsocket_recv(int, void *, int, int);
+int     _System __libsocket_recvfrom(int, void *, int, int, struct sockaddr *, int *);
+int     _System __libsocket_recvmsg(int, struct msghdr *, int);
+int     _System __libsocket_send(int, const void *, int, int);
+int     _System __libsocket_sendmsg(int, __const__ struct msghdr *, int);
+int     _System __libsocket_sendto(int, __const__ void *, int, int, __const__ struct sockaddr *, int);
+int     _System __libsocket_setsockopt(int, int, int, __const__ void *, int);
+int     _System __libsocket_shutdown(int, int);
+int     _System __libsocket_sock_errno(void);
+int     _System __libsocket_socket(int, int, int);
+int     _System __libsocket_socketpair(int, int, int, int *);
+int     _System __libsocket_soclose(int);
+int     _System __libsocket_accept_and_recv(long, long*, struct sockaddr *, long*, struct sockaddr*, long*, caddr_t, size_t);
+void    _System __libsocket_addsockettolist(int);
+int     _System __libsocket_removesocketfromlist(int);
+ssize_t _System __libsocket_so_readv(int, struct iovec *, int);
+ssize_t _System __libsocket_so_writev(int, struct iovec *, int);
+int     _System __libsocket_so_cancel(int);
+int     _System __libsocket_soabort(int);
+int     _System __libsocket_Raccept(int, struct sockaddr *, int *);
 struct sockaddr_in;
-int     TCPCALL __libsocket_tcpip4_Rbind(int, struct sockaddr_in *, int, struct sockaddr_in *);
-int     TCPCALL __libsocket_Rbind(int, struct sockaddr *, int, struct sockaddr *);
-int     TCPCALL __libsocket_Rconnect(int, const struct sockaddr *, int);
-int     TCPCALL __libsocket_Rgetsockname(int, struct sockaddr *, int *);
-int     TCPCALL __libsocket_Rlisten(int, int);
+int     _System __libsocket_tcpip4_Rbind(int, struct sockaddr_in *, int, struct sockaddr_in *);
+int     _System __libsocket_Rbind(int, struct sockaddr *, int, struct sockaddr *);
+int     _System __libsocket_Rconnect(int, const struct sockaddr *, int);
+int     _System __libsocket_Rgetsockname(int, struct sockaddr *, int *);
+int     _System __libsocket_Rlisten(int, int);
 #ifndef TCPV40HDRS
-ssize_t TCPCALL __libsocket_send_file(int *, struct sf_parms *, int );
-int     TCPCALL __libsocket_socketpair(int af, int type, int flags, int *osfd);
-#endif
-char *  TCPCALL __libsocket_sock_strerror(int);
+ssize_t _System __libsocket_send_file(int *, struct sf_parms *, int );
+int     _System __libsocket_socketpair(int af, int type, int flags, int *osfd);
+#endif
+char *  _System __libsocket_sock_strerror(int);
 #ifdef TCPV40HDRS
-int     TCPCALL __libsocket_bsdselect(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#else
-int     TCPCALL __libsocket_bsdselect(int, v5_fd_set *, v5_fd_set *, v5_fd_set *, struct timeval *);
-#endif
-void    TCPCALL __libsocket_set_errno(int);
+int     _System __libsocket_bsdselect(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#else
+int     _System __libsocket_bsdselect(int, v5_fd_set *, v5_fd_set *, v5_fd_set *, struct timeval *);
+#endif
+void    _System __libsocket_set_errno(int);
 /** @} */
 

trunk/src/emx/src/lib/startup/startup.smak

@@ -7 +7 @@
 .TSRC.386 := $(addprefix src/lib/startup/386/,crt0.s dll0.s)
 .TSRC   := $(.TSRC.$(CPU))
-.INSDIR :=
+.INSDIR := lib/
 include common.smak
+.OBJS += $(addprefix $.omf/src/lib/startup/386/,crt0.obj dll0.obj)
 
 # define what to do     

trunk/src/emx/src/libsocket/socket.c

@@ -39 +39 @@
 #include "socket.h"
 
-
 int socket(int af, int type, int protocol)
 {

trunk/src/emx/src/libsocket/socket_tcpipv4.imp

@@ -26 +26 @@
 __libsocket_soabort     so32dll   19 ?
 os2_sock_errno          so32dll   20 ?
+_os2_sock_errno         so32dll   20 ?
 __libsocket_sock_errno  so32dll   20 ?
 __libsocket_recvmsg     so32dll   21 ?