Changeset 354 for trunk/src/emx/include/arpa/nameser.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/arpa/nameser.h (modified) (1 diff, 1 prop)

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