Changeset 354 for trunk/src/emx/include/utils.h

Timestamp:

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

Author:

bird

Message:

#434: no function redefinitions. TCPCALL not _System.

File:

• trunk/src/emx/include/utils.h (modified) (3 diffs, 1 prop)

trunk/src/emx/include/utils.h

@@ -3 +3 @@
 #define _UTILS_H_
 
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
 #ifdef TCPV40HDRS
 
-/** @name tcpip40 function mappings.
- * @{ */
-#define lswap   tcpip40_lswap
-#define bswap   tcpip40_bswap
-#define rexec   tcpip40_rexec
-/* @} */
-unsigned long   _System lswap(unsigned long);
-unsigned short  _System bswap(unsigned short);
-int             _System rexec(char **, int, char *, char *, char *, int *);
+unsigned long   TCPCALL lswap(unsigned long);
+unsigned short  TCPCALL bswap(unsigned short);
+int             TCPCALL rexec(char **, int, char *, char *, char *, int *);
 
 /* Definition for bswap */
@@ -23 +21 @@
 #define copyout(x,y,z)  memcpy((y),(x),(z))
 #ifndef XP_OS2_VACPP /* mozilla */
+/* We've got the real thing now. (aliased at least)
 #define strcasecmp(x,y)     strcmpi((x),(y))
 #define strncasecmp(x,y,z)  strnicmp(x,y,z)
+*/
 #endif
+int strcasecmp (__const__ char *, __const__ char *);
+int strncasecmp (__const__ char *, __const__ char *, size_t);
 
 #ifndef MIN
@@ -39 +41 @@
 
 #else
-int     _System rexec(char **, int, char *, char *, char *, int *);
+int     TCPCALL rexec(char **, int, char *, char *, char *, int *);
 #endif /*TCPV40HDRS*/