Changeset 354 for trunk/src/emx/include/sys

Timestamp:

Jul 11, 2003, 1:39:47 PM (22 years ago)

Author:

bird

Message:

#434: no function redefinitions. TCPCALL not _System.

Location:

trunk/src/emx/include/sys

Files:

• ioccom.h (modified) (2 diffs, 1 prop)
• select.h (modified) (1 diff, 1 prop)
• socket.h (modified) (3 diffs, 1 prop)
• time.h (modified) (1 diff, 1 prop)
• uio.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/sys/ioccom.h

@@ -72 +72 @@
 #include <sys/cdefs.h>
 
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
 __BEGIN_DECLS
 #ifdef TCPV40HDRS
-/** @name tcpip40 function mappings.
- * @{ */
-#define so_ioctl    tcpip40_so_ioctl
-/* @} */
-
 /** The v40 socket ioctl interface.
  * @remark sys based libc have separeate handle spaces for sockets and files
  *         therefore this socket specific call.
  */
-int         _System so_ioctl __P((int, int, char *, int));
+int         TCPCALL so_ioctl __P((int, int, char *, int));
 #else
 /** The v41+ BSD socket ioctl interface.
@@ -89 +88 @@
  *         therefore this socket specific call.
  */
-int         _System so_ioctl __P((int, unsigned long, ...));
+int         TCPCALL so_ioctl __P((int, unsigned long, ...));
 /** The v41+ OS/2 specific socket ioctl interface. */
-int         _System os2_ioctl __P((int, unsigned long, char *, int));
+int         TCPCALL os2_ioctl __P((int, unsigned long, char *, int));
 #endif
 

trunk/src/emx/include/sys/select.h

@@ -95 +95 @@
  */
 int _System bsdselect(int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *);
-/** @name tcpip40 function mappings.
- * @{ */
-#define os2_select  tcpip40_os2_select
-/* @} */
 #endif
 /** This is the TCPIP OS/2 styled select. */

trunk/src/emx/include/sys/socket.h

@@ -432 +432 @@
 #endif
 
-#ifdef TCPV40HDRS
-/** @name tcpip40 function mappings.
- * @{ */
-#define accept                  tcpip40_accept
-#define bind                    tcpip40_bind
-#define connect                 tcpip40_connect
-#define gethostid               tcpip40_gethostid
-#define getpeername             tcpip40_getpeername
-#define getsockname             tcpip40_getsockname
-#define getsockopt              tcpip40_getsockopt
-#define listen                  tcpip40_listen
-#define recv                    tcpip40_recv
-#define recvfrom                tcpip40_recvfrom
-#define recvmsg                 tcpip40_recvmsg
-#define send                    tcpip40_send
-#define sendto                  tcpip40_sendto
-#define sendmsg                 tcpip40_sendmsg
-#define setsockopt              tcpip40_setsockopt
-#define shutdown                tcpip40_shutdown
-#define socket                  tcpip40_socket
-#define socketpair              tcpip40_socketpair
-#define addsockettolist         tcpip40_addsockettolist
-#define removesocketfromlist    tcpip40_removesocketfromlist
-#define sock_init               tcpip40_sock_init
-#define sock_errno              tcpip40_sock_errno
-#define psock_errno             tcpip40_psock_errno
-#define soclose                 tcpip40_soclose
-#define so_cancel               tcpip40_so_cancel
-#define Raccept                 tcpip40_Raccept
-#define Rbind                   tcpip40_Rbind
-#define Rconnect                tcpip40_Rconnect
-#define Rgetsockname            tcpip40_Rgetsockname
-#define Rlisten                 tcpip40_Rlisten
-/* @} */
-#endif
-
-int     _System accept (int, struct sockaddr *, int *);
-int     _System bind (int, __const__ struct sockaddr *, int);
-int     _System connect (int, __const__ struct sockaddr *, int);
-int     _System gethostid (void);
-int     _System getpeername (int, struct sockaddr *, int *);
-int     _System getsockname (int, struct sockaddr *, int *);
-int     _System getsockopt (int, int, int, void *, int *);
-int     _System listen (int, int);
-int     _System recv (int, void *, int, int);
-int     _System recvfrom (int, void *, int, int, struct sockaddr *, int *);
-int     _System recvmsg (int, struct msghdr *, int);
-int     _System send (int, __const__ void *, int, int);
-int     _System sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
-int     _System sendmsg (int, __const__ struct msghdr *, int);
-int     _System setsockopt (int, int, int, __const__ void *, int);
-int     _System shutdown (int, int);
-int     _System socket (int, int, int);
-int     _System socketpair (int, int, int, int *);
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
+int     TCPCALL accept (int, struct sockaddr *, int *);
+int     TCPCALL bind (int, __const__ struct sockaddr *, int);
+int     TCPCALL connect (int, __const__ struct sockaddr *, int);
+int     TCPCALL gethostid (void);
+int     TCPCALL getpeername (int, struct sockaddr *, int *);
+int     TCPCALL getsockname (int, struct sockaddr *, int *);
+int     TCPCALL getsockopt (int, int, int, void *, int *);
+int     TCPCALL listen (int, int);
+int     TCPCALL recv (int, void *, int, int);
+int     TCPCALL recvfrom (int, void *, int, int, struct sockaddr *, int *);
+int     TCPCALL recvmsg (int, struct msghdr *, int);
+int     TCPCALL send (int, __const__ void *, int, int);
+int     TCPCALL sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
+int     TCPCALL sendmsg (int, __const__ struct msghdr *, int);
+int     TCPCALL setsockopt (int, int, int, __const__ void *, int);
+int     TCPCALL shutdown (int, int);
+int     TCPCALL socket (int, int, int);
+int     TCPCALL socketpair (int, int, int, int *);
 
 /* EMX addition */
@@ -491 +459 @@
 
 #ifndef TCPV40HDRS
-int     _System accept_and_recv (long, long*, struct sockaddr *, long*, struct sockaddr*, long*, caddr_t, size_t);
+int     TCPCALL accept_and_recv (long, long*, struct sockaddr *, long*, struct sockaddr*, long*, caddr_t, size_t);
 #endif
 
 /* OS/2 additions */
-void    _System addsockettolist(int);
-int     _System removesocketfromlist(int);
+void    TCPCALL addsockettolist(int);
+int     TCPCALL removesocketfromlist(int);
 #include <sys/ioccom.h>
 #ifdef TCPV40HDRS
 #include <sys/select.h>
 #endif
-int     _System sock_init( void );
-int     _System sock_errno( void );
-void    _System psock_errno( char * );
-int     _System soclose( int );
-int     _System so_cancel(int);
-int     _System Raccept(int, struct sockaddr *, int *);
+int     TCPCALL sock_init( void );
+int     TCPCALL sock_errno( void );
+void    TCPCALL psock_errno( char * );
+int     TCPCALL soclose( int );
+int     TCPCALL so_cancel(int);
+int     TCPCALL Raccept(int, struct sockaddr *, int *);
 #ifdef TCPV40HDRS
 struct sockaddr_in;
-int     _System Rbind(int, struct sockaddr_in *, int, struct sockaddr_in *);
-#else
-int     _System Rbind(int, struct sockaddr *, int, struct sockaddr *);
-#endif
-int     _System Rconnect(int, const struct sockaddr *, int);
-int     _System Rgetsockname(int, struct sockaddr *, int *);
-int     _System Rlisten(int, int);
-#ifndef TCPV40HDRS
-ssize_t _System send_file(int *, struct sf_parms *, int );
-char *  _System sock_strerror(int);
-int     _System getinetversion(char *);
+int     TCPCALL Rbind(int, struct sockaddr_in *, int, struct sockaddr_in *);
+#else
+int     TCPCALL Rbind(int, struct sockaddr *, int, struct sockaddr *);
+#endif
+int     TCPCALL Rconnect(int, const struct sockaddr *, int);
+int     TCPCALL Rgetsockname(int, struct sockaddr *, int *);
+int     TCPCALL Rlisten(int, int);
+#ifndef TCPV40HDRS
+ssize_t TCPCALL send_file(int *, struct sf_parms *, int );
+char *  TCPCALL sock_strerror(int);
+int     TCPCALL getinetversion(char *);
 #endif
 
@@ -525 +493 @@
 /* more OS/2 stuff. */
 #ifndef MAXSOCKETS
-#define MAXSOCKETS      2048
+#ifdef TCPV40HDRS
+#define MAXSOCKETS  2048
+#else
+#define MAXSOCKETS  32768
+#endif
 #endif
 

trunk/src/emx/include/sys/time.h

@@ -156 +156 @@
 
 #if defined(TCPV40HDRS) || !defined(_POSIX_SOURCE)
-/** @name tcpip40 function mappings.
- * @{ */
-/* utimes, gettimeofday and settimeofday is EMX so no mapping is needed. */
-#define adjtime       tcpip40_adjtime
-#define getitimer     tcpip40_getitimer
-#define setitimer     tcpip40_setitimer
-/* @} */
 /* These are libc functions so no _System convention. */
 int     utimes (__const__ char *, __const__ struct timeval *);
 int     gettimeofday (struct timeval *, struct timezone *);
 int     settimeofday (__const__ struct timeval *, __const__ struct timezone *);
+
 #ifndef TCPV40HDRS
 #include <sys/cdefs.h>
-int     _System adjtime(const struct timeval *, struct timeval *);
-int     _System getitimer(int, struct itimerval *);
-int     _System setitimer(int, const struct itimerval *, struct itimerval *);
+
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
+int     TCPCALL adjtime(const struct timeval *, struct timeval *);
+int     TCPCALL getitimer(int, struct itimerval *);
+int     TCPCALL setitimer(int, const struct itimerval *, struct itimerval *);
 #endif
 #endif /* TCPV40HDRS */

trunk/src/emx/include/sys/uio.h

@@ -62 +62 @@
         UIO_USERISPACE          /* from user I space */
 };
-/** @name tcpip40 function mappings.
- * @{ */
-#define so_readv        tcpip40_readv
-#define so_writev       tcpip40_writev
-/* @} */
 #endif
 
 /* TCPIP versions */
-int _System so_readv (int, __const__ struct iovec *, int);
-int _System so_writev (int, __const__ struct iovec *, int);
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
+int TCPCALL so_readv (int, __const__ struct iovec *, int);
+int TCPCALL so_writev (int, __const__ struct iovec *, int);
 
 /* EMX versions */