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

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/arpa

Files:

• inet.h (modified) (2 diffs, 1 prop)
• nameser.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/arpa/inet.h

@@ -44 +44 @@
 #endif
 
-
-#ifdef TCPV40HDRS
-/** @name tcpip40 function mappings.
- * @{ */
-#define inet_addr       tcpip40_inet_addr
-#define inet_lnaof      tcpip40_inet_lnaof
-#define inet_makeaddr   tcpip40_inet_makeaddr
-#define inet_netof      tcpip40_inet_netof
-#define inet_network    tcpip40_inet_network
-#define inet_ntoa       tcpip40_inet_ntoa
-/* @} */
+#ifndef TCPCALL
+#define TCPCALL _System
 #endif
 
@@ -64 +55 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
-int             _System inet_aton (const char *, struct in_addr *);
-char *          _System inet_neta (u_long, char *, size_t);
-char *          _System inet_net_ntop (int, const void *, int, char *, size_t);
-int             _System inet_net_pton (int, const char *, void *, size_t);
-int             _System inet_pton (int af, const char *src, void *dst);
-const char *    _System inet_ntop (int af, const void *src, char *dst, size_t s);
-u_int           _System inet_nsap_addr (const char *, u_char *, int maxlen);
-char *          _System inet_nsap_ntoa (int, const u_char *, char *ascii);
+int             TCPCALL inet_aton (const char *, struct in_addr *);
+char *          TCPCALL inet_neta (u_long, char *, size_t);
+char *          TCPCALL inet_net_ntop (int, const void *, int, char *, size_t);
+int             TCPCALL inet_net_pton (int, const char *, void *, size_t);
+int             TCPCALL inet_pton (int af, const char *src, void *dst);
+const char *    TCPCALL inet_ntop (int af, const void *src, char *dst, size_t s);
+u_int           TCPCALL inet_nsap_addr (const char *, u_char *, int maxlen);
+char *          TCPCALL inet_nsap_ntoa (int, const u_char *, char *ascii);
 #endif
 
-extern u_long   _System inet_addr(__const__ char*);
-extern u_long   _System inet_lnaof(struct in_addr);
-extern struct in_addr _System inet_makeaddr(u_long, u_long);
-extern u_long   _System inet_netof(struct in_addr);
-extern u_long   _System inet_network(__const__ char*);
-extern char*    _System inet_ntoa(struct in_addr);
+extern u_long   TCPCALL inet_addr(__const__ char*);
+extern u_long   TCPCALL inet_lnaof(struct in_addr);
+extern struct in_addr TCPCALL inet_makeaddr(u_long, u_long);
+extern u_long   TCPCALL inet_netof(struct in_addr);
+extern u_long   TCPCALL inet_network(__const__ char*);
+extern char*    TCPCALL inet_ntoa(struct in_addr);
 
 #if defined (__cplusplus)

trunk/src/emx/include/arpa/nameser.h

@@ -362 +362 @@
 
 
-#ifdef TCPV40HDRS
-/** @name tcpip40 function mappings.
- * @{ */
-#define _getshort           tcpip40__getshort
-#define _getlong            tcpip40__getlong
-#define putshort            tcpip40_putshort
-#define putlong             tcpip40_putlong
-#define dn_expand           tcpip40_dn_expand
-#define dn_comp             tcpip40_dn_comp
-#define dn_find             tcpip40_dn_find
-#define dn_skipname         tcpip40_dn_skipname
-#define res_init            tcpip40_res_init
-#define res_mkquery         tcpip40_res_mkquery
-#define res_send            tcpip40_res_send
-#define res_query           tcpip40_res_query
-#define res_search          tcpip40_res_search
-#define res_querydomain     tcpip40_res_querydomain
-/* @} */
-#endif
-
 /* function prototypes */
-u_short _System _getshort(u_char*);
-u_long  _System _getlong(u_char*);
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
+u_short TCPCALL _getshort(u_char*);
+u_long  TCPCALL _getlong(u_char*);
 #ifdef TCPV40HDRS /* newer have this in resolver */
-void    _System putshort(u_short, u_char *);
-void    _System putlong(u_long, u_char *);
-int     _System dn_expand(__const__ u_char*, __const__ u_char*, __const__ u_char*, u_char*, int);
-int     _System dn_comp(__const__ u_char*, u_char*, int, u_char**, u_char**);
-int     _System dn_find(u_char*, u_char*, u_char**, u_char**);
-int     _System dn_skipname(__const__ u_char*, __const__ u_char*);
-int     _System res_init(void);
-int     _System res_mkquery(int, __const__ char*, int, int, __const__ char*, int, __const__ struct rrec*, char*, int);
-int     _System res_send(__const__ char*, int, char*, int);
-int     _System res_query(char*, int, int, u_char*, int);
-int     _System res_search(char*, int, int, u_char*, int);
-int     _System res_querydomain(char*, char*, int, int, u_char*, int);
+void    TCPCALL putshort(u_short, u_char *);
+void    TCPCALL putlong(u_long, u_char *);
+int     TCPCALL dn_expand(__const__ u_char*, __const__ u_char*, __const__ u_char*, u_char*, int);
+int     TCPCALL dn_comp(__const__ u_char*, u_char*, int, u_char**, u_char**);
+int     TCPCALL dn_find(u_char*, u_char*, u_char**, u_char**);
+int     TCPCALL dn_skipname(__const__ u_char*, __const__ u_char*);
+int     TCPCALL res_init(void);
+int     TCPCALL res_mkquery(int, __const__ char*, int, int, __const__ char*, int, __const__ struct rrec*, char*, int);
+int     TCPCALL res_send(__const__ char*, int, char*, int);
+int     TCPCALL res_query(char*, int, int, u_char*, int);
+int     TCPCALL res_search(char*, int, int, u_char*, int);
+int     TCPCALL res_querydomain(char*, char*, int, int, u_char*, int);
 #endif