Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/dist/bind/lib/resolv pull up 1.4. approved by thorpej:



details:   https://anonhg.NetBSD.org/src/rev/f660a91e9f26
branches:  netbsd-1-5
changeset: 489259:f660a91e9f26
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 26 00:57:40 2000 +0000

description:
pull up 1.4.  approved by thorpej:
>do not #undef _res; we want to get any #define our local resolv.h has.
>fixes last part of PR#10651.

diffstat:

 dist/bind/lib/resolv/res_data.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r ee7b37a89bb9 -r f660a91e9f26 dist/bind/lib/resolv/res_data.c
--- a/dist/bind/lib/resolv/res_data.c   Sat Aug 26 00:56:49 2000 +0000
+++ b/dist/bind/lib/resolv/res_data.c   Sat Aug 26 00:57:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: res_data.c,v 1.3 2000/03/01 10:50:00 itojun Exp $      */
+/*     $NetBSD: res_data.c,v 1.3.4.1 2000/08/26 00:57:40 mrg Exp $     */
 
 /*
  * Copyright (c) 1995-1999 by Internet Software Consortium.
@@ -42,7 +42,10 @@
 #include <unistd.h>
 
 #include "port_after.h"
+/* While libc resolver is bind4; the local resolv.h changes _res */
+#ifndef __NetBSD__
 #undef _res
+#endif
 
 const char *_res_opcodes[] = {
        "QUERY",



Home | Main Index | Thread Index | Old Index