[src/netbsd-1-4]: src/dist/bind/include Pull up revision 1.3 (requested by it...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a69950958e1
branches:  netbsd-1-4
changeset: 470460:3a69950958e1
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 01 14:00:31 2000 +0000

description:
Pull up revision 1.3 (requested by itojun):
  Make BIND8 not use the BIND4 code in libc.

diffstat:

 dist/bind/include/port_before.h |   4 +---
 dist/bind/include/resolv.h      |  12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diffs (69 lines):

diff -r a18b3f092d55 -r 3a69950958e1 dist/bind/include/port_before.h
--- a/dist/bind/include/port_before.h   Wed Mar 01 14:00:03 2000 +0000
+++ b/dist/bind/include/port_before.h   Wed Mar 01 14:00:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: port_before.h,v 1.2.2.2 1999/12/04 17:08:40 he Exp $   */
+/*     $NetBSD: port_before.h,v 1.2.2.3 2000/03/01 14:00:31 he Exp $   */
 
 /*
 #define WANT_IRS_NIS
@@ -12,5 +12,3 @@
 
 #define SETGRENT_VOID
 #define SETPWENT_VOID
-
-#include "namespace.h"
diff -r a18b3f092d55 -r 3a69950958e1 dist/bind/include/resolv.h
--- a/dist/bind/include/resolv.h        Wed Mar 01 14:00:03 2000 +0000
+++ b/dist/bind/include/resolv.h        Wed Mar 01 14:00:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: resolv.h,v 1.2.2.2 1999/12/04 17:08:53 he Exp $        */
+/*     $NetBSD: resolv.h,v 1.2.2.3 2000/03/01 14:00:31 he Exp $        */
 
 /*
  * Copyright (c) 1983, 1987, 1989
@@ -96,11 +96,7 @@
  *             #endif
  */
 
-#ifdef __NetBSD__
-# define RES_SET_H_ERRNO(r,x) (h_errno = (r)->res_h_errno = (x))
-#else
-# define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
-#endif
+#define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
 struct __res_state; /* forward */
 void __h_errno_set(struct __res_state *res, int err);
 
@@ -244,7 +240,6 @@
 #endif
 
 #ifndef __BIND_NOSTATIC
-#ifndef        __NetBSD__      /* XXX namespace.h */
 #define fp_nquery              __fp_nquery
 #define fp_query               __fp_query
 #define hostalias              __hostalias
@@ -258,7 +253,6 @@
 #define res_search             __res_search
 #define res_send               __res_send
 #define res_sendsigned         __res_sendsigned
-#endif /* !__NetBSD__ */
 
 __BEGIN_DECLS
 void           fp_nquery __P((const u_char *, int, FILE *));
@@ -295,7 +289,6 @@
 extern const struct res_sym __p_rcode_syms[];
 #endif /* SHARED_LIBBIND */
 
-#ifndef        __NetBSD__      /* XXX namespace.h */
 #define b64_ntop               __b64_ntop
 #define b64_pton               __b64_pton
 #define dn_comp                        __dn_comp
@@ -340,7 +333,6 @@
 #define sym_ntop               __sym_ntop
 #define sym_ntos               __sym_ntos
 #define sym_ston               __sym_ston
-#endif /* !__NetBSD__ */
 __BEGIN_DECLS
 int            res_hnok __P((const char *));
 int            res_ownok __P((const char *));