Changeset 275

Timestamp:

Jun 2, 2003, 9:53:24 PM (22 years ago)

Author:

bird

Message:

#434: readv/writev crash.

Location:

trunk/src/emx

Files:

• include/sys/uio.h (modified) (1 diff, 1 prop)
• src/lib/socket/socket.imp (modified) (1 diff, 1 prop)
• src/libsocket/socket.imp (modified) (1 diff, 1 prop)

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

@@ -44 +44 @@
         UIO_USERISPACE          /* from user I space */
 };
+/** @name tcpip40 function mappings.
+ * @{ */
+#define so_readv        tcpip40_readv
+#define so_writev       tcpip40_writev
+/* @} */
 #endif
 
-/** @name tcpip40 function mappings.
- * @{ */
-//@@@ name conflict - a.z. #define readv         tcpip40_readv
-//@@@ name conflict - a.z. #define writev        tcpip40_writev
-/* @} */
+/* TCPIP versions */
+int _System so_readv (int, __const__ struct iovec *, int);
+int _System so_writev (int, __const__ struct iovec *, int);
 
-//@@@ name conflict - a.z. int _System readv (int, __const__ struct iovec *, int);
-//@@@ name conflict - a.z. int _System writev (int, __const__ struct iovec *, int);
+/* EMX versions */
+int readv (int, __const__ struct iovec *, int);
+int writev (int, __const__ struct iovec *, int);
 
 #if defined (__cplusplus)

trunk/src/emx/src/lib/socket/socket.imp

@@ -131 +131 @@
 recvmsg                 tcpip32   21 ?
 sendmsg                 tcpip32   22 ?
-readv                   tcpip32   23 ?
-writev                  tcpip32   24 ?
+so_readv                tcpip32   23 ?
+so_writev               tcpip32   24 ?
 shutdown                tcpip32   25 ?
 sock_init               tcpip32   26 ?

trunk/src/emx/src/libsocket/socket.imp

@@ -131 +131 @@
 recvmsg                 tcpip32   21 ?
 sendmsg                 tcpip32   22 ?
-readv                   tcpip32   23 ?
-writev                  tcpip32   24 ?
+so_readv                tcpip32   23 ?
+so_writev               tcpip32   24 ?
 shutdown                tcpip32   25 ?
 sock_init               tcpip32   26 ?