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

trunk/src/emx/include/resolv.h

@@ -34 +34 @@
  *
  *      from: @(#)resolv.h      5.15 (Berkeley) 4/3/91
- *      resolv.h,v 1.3 2003/05/19 13:20:02 bird Exp
+ *      resolv.h,v 1.4 2003/07/11 11:39:47 bird Exp
  */
 
@@ -160 +160 @@
 #ifdef TCPV40HDRS
 
-/** @name tcpip40 function mappings.
- * @{ */
-#define _res tcpip40__res
-/* @} */
 extern  struct state _res;
 
@@ -192 +188 @@
         res_sendhookact;
 
-typedef res_sendhookact (* _System res_send_qhook)(struct sockaddr_in * const *ns,
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
+
+typedef res_sendhookact (* TCPCALL res_send_qhook)(struct sockaddr_in * const *ns,
                                               const u_char **query,
                                               int *querylen,
@@ -199 +199 @@
                                               int *resplen);
 
-typedef res_sendhookact (* _System res_send_rhook)(const struct sockaddr_in *ns,
+typedef res_sendhookact (* TCPCALL res_send_rhook)(const struct sockaddr_in *ns,
                                               const u_char *query,
                                               int querylen,
@@ -264 +264 @@
 #define res_close       __res_close
 
-int             _System res_hnok(const char *);
-int             _System res_ownok(const char *);
-int             _System res_mailok(const char *);
-int             _System res_dnok(const char *);
-int             _System sym_ston(const struct res_sym *, char *, int *);
-const char *    _System sym_ntos(const struct res_sym *, int, int *);
-const char *    _System sym_ntop(const struct res_sym *, int, int *);
-int             _System b64_ntop(u_char const *, size_t, char *, size_t);
-int             _System b64_pton(char const *, u_char *, size_t);
-int             _System loc_aton(const char *, u_char *);
-const char *    _System loc_ntoa(const u_char *, char *);
-int             _System dn_skipname(const u_char *, const u_char *);
-void            _System fp_resstat(struct __res_state *, int);
-void            _System fp_query(const u_char *, int);
-void            _System fp_nquery(const u_char *, int, int);
-const char *    _System hostalias(const char *);
-void            _System putlong(u_int32_t, u_char *);
-void            _System putshort(u_int16_t, u_char *);
-const char *    _System p_class(int);
-const char *    _System p_time(u_int32_t);
-const char *    _System p_type(int);
-void            _System p_query(const u_char *);
-const u_char *  _System p_cdnname(const u_char *, const u_char *, int, int);
-const u_char *  _System p_cdname(const u_char *, const u_char *, int);
-const u_char *  _System p_fqnname(const u_char *cp, const u_char *msg,
+int             TCPCALL res_hnok(const char *);
+int             TCPCALL res_ownok(const char *);
+int             TCPCALL res_mailok(const char *);
+int             TCPCALL res_dnok(const char *);
+int             TCPCALL sym_ston(const struct res_sym *, char *, int *);
+const char *    TCPCALL sym_ntos(const struct res_sym *, int, int *);
+const char *    TCPCALL sym_ntop(const struct res_sym *, int, int *);
+int             TCPCALL b64_ntop(u_char const *, size_t, char *, size_t);
+int             TCPCALL b64_pton(char const *, u_char *, size_t);
+int             TCPCALL loc_aton(const char *, u_char *);
+const char *    TCPCALL loc_ntoa(const u_char *, char *);
+int             TCPCALL dn_skipname(const u_char *, const u_char *);
+void            TCPCALL fp_resstat(struct __res_state *, int);
+void            TCPCALL fp_query(const u_char *, int);
+void            TCPCALL fp_nquery(const u_char *, int, int);
+const char *    TCPCALL hostalias(const char *);
+void            TCPCALL putlong(u_int32_t, u_char *);
+void            TCPCALL putshort(u_int16_t, u_char *);
+const char *    TCPCALL p_class(int);
+const char *    TCPCALL p_time(u_int32_t);
+const char *    TCPCALL p_type(int);
+void            TCPCALL p_query(const u_char *);
+const u_char *  TCPCALL p_cdnname(const u_char *, const u_char *, int, int);
+const u_char *  TCPCALL p_cdname(const u_char *, const u_char *, int);
+const u_char *  TCPCALL p_fqnname(const u_char *cp, const u_char *msg,
                                              int, char *, int);
-const u_char *  _System p_fqname(const u_char *, const u_char *, int);
-const u_char *  _System p_rr(const u_char *, const u_char *, int);
-const char *    _System p_option(u_long option);
-char *          _System p_secstodate(u_long);
-int             _System dn_count_labels(char *);
-int             _System dn_comp(const char *, u_char *, int,
+const u_char *  TCPCALL p_fqname(const u_char *, const u_char *, int);
+const u_char *  TCPCALL p_rr(const u_char *, const u_char *, int);
+const char *    TCPCALL p_option(u_long option);
+char *          TCPCALL p_secstodate(u_long);
+int             TCPCALL dn_count_labels(char *);
+int             TCPCALL dn_comp(const char *, u_char *, int,
                                 u_char **, u_char **);
-int             _System dn_expand(const u_char *, const u_char *, const u_char *,
+int             TCPCALL dn_expand(const u_char *, const u_char *, const u_char *,
                                   char *, int);
-int             _System res_init(void);
-u_int           _System res_randomid(void);
-int             _System res_query(const char *, int, int, u_char *, int);
-int             _System res_search(const char *, int, int, u_char *, int);
-int             _System res_querydomain(const char *, const char *, int, int, u_char *, int);
-int             _System res_mkquery(int, const char *, int, int, const u_char *, int,
+int             TCPCALL res_init(void);
+u_int           TCPCALL res_randomid(void);
+int             TCPCALL res_query(const char *, int, int, u_char *, int);
+int             TCPCALL res_search(const char *, int, int, u_char *, int);
+int             TCPCALL res_querydomain(const char *, const char *, int, int, u_char *, int);
+int             TCPCALL res_mkquery(int, const char *, int, int, const u_char *, int,
                                     const u_char *, u_char *, int);
-int             _System res_send(const u_char *, int, u_char *, int);
-int             _System res_isourserver(const struct sockaddr_in *);
-int             _System res_nameinquery(const char *, int, int,
+int             TCPCALL res_send(const u_char *, int, u_char *, int);
+int             TCPCALL res_isourserver(const struct sockaddr_in *);
+int             TCPCALL res_nameinquery(const char *, int, int,
                                         const u_char *, const u_char *);
-int             _System res_queriesmatch(const u_char *, const u_char *,
+int             TCPCALL res_queriesmatch(const u_char *, const u_char *,
                                          const u_char *, const u_char *);
-void            _System res_close(void);
-int             _System dn_find(u_char *exp_dn, u_char *msg,
+void            TCPCALL res_close(void);
+int             TCPCALL dn_find(u_char *exp_dn, u_char *msg,
                                u_char **dnptrs, u_char **lastdnptr);
 #endif /* !TCPV40HDRS */