From 4c0738468507d02722cc8577061080adeff8a9b7 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 4 Jan 1999 00:04:04 +0000 Subject: [PATCH] Avoid problems when trying to link BIND 8 statically, fixes PR bin/6717 by gnatios Souvatzis. --- usr.sbin/bind/Makefile.inc | 4 +- usr.sbin/bind/include/namespace.h | 58 +++++++++++++++++++++++++++++ usr.sbin/bind/include/port_before.h | 4 +- usr.sbin/bind/include/resolv.h | 4 +- 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 usr.sbin/bind/include/namespace.h diff --git a/usr.sbin/bind/Makefile.inc b/usr.sbin/bind/Makefile.inc index c71f048f43f4..c3635883d3f4 100644 --- a/usr.sbin/bind/Makefile.inc +++ b/usr.sbin/bind/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 1998/10/09 19:30:02 tron Exp $ +# $NetBSD: Makefile.inc,v 1.3 1999/01/04 00:04:04 tron Exp $ BIND_DIR= ${.CURDIR}/.. @@ -12,4 +12,4 @@ LIB_BIND!= cd ${BIND_DIR}/lib; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | \ ${MAKE} -s -f - INCLUDE?= -I. -I${BIND_DIR}/include -LIBRARY?= -L${LIB_BIND}/ -lbind +LIBRARY?= -L${LIB_BIND} -lbind diff --git a/usr.sbin/bind/include/namespace.h b/usr.sbin/bind/include/namespace.h new file mode 100644 index 000000000000..c8810314bbbd --- /dev/null +++ b/usr.sbin/bind/include/namespace.h @@ -0,0 +1,58 @@ +/* $NetBSD: namespace.h,v 1.1 1999/01/04 00:04:05 tron Exp $ + +/* + * Copyright (c) 1999 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matthias Scheler. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + +#ifndef _NAMESPACE_H_ +#define _NAMESPACE_H_ + +#define inet_addr _inet_addr +#define inet_aton _inet_aton +#define inet_pton _inet_pton +#define fp_nquery __fp_nquery +#define fp_resstat __fp_resstat +#define hostalias __hostalias +#define p_class __p_class +#define p_type __p_type +#define putlong __putlong +#define putshort __putshort +#define res_dnok __res_dnok +#define res_hnok __res_hnok +#define res_send_setqhook _res_send_setqhook +#define res_send_setrhook _res_send_setrhook + +#endif /* _NAMESPACE_H_ */ diff --git a/usr.sbin/bind/include/port_before.h b/usr.sbin/bind/include/port_before.h index 61d0753a96ab..d911f9c04c55 100644 --- a/usr.sbin/bind/include/port_before.h +++ b/usr.sbin/bind/include/port_before.h @@ -1,4 +1,4 @@ -/* $NetBSD: port_before.h,v 1.1.1.1 1998/10/05 18:01:58 tron Exp $ */ +/* $NetBSD: port_before.h,v 1.2 1999/01/04 00:04:05 tron Exp $ */ /* #define WANT_IRS_NIS @@ -6,3 +6,5 @@ #define WANT_IRS_GR */ #define SIG_FN void + +#include "namespace.h" diff --git a/usr.sbin/bind/include/resolv.h b/usr.sbin/bind/include/resolv.h index 807aedd5a30d..05dd46aac3ec 100644 --- a/usr.sbin/bind/include/resolv.h +++ b/usr.sbin/bind/include/resolv.h @@ -1,4 +1,4 @@ -/* $NetBSD: resolv.h,v 1.1.1.1 1998/10/05 18:01:58 tron Exp $ */ +/* $NetBSD: resolv.h,v 1.2 1999/01/04 00:04:06 tron Exp $ */ /* * Copyright (c) 1983, 1987, 1989 @@ -197,6 +197,7 @@ extern struct __res_state _res; extern const struct res_sym __p_class_syms[]; extern const struct res_sym __p_type_syms[]; +#ifndef __NetBSD__ #define res_hnok __res_hnok #define res_ownok __res_ownok #define res_mailok __res_mailok @@ -245,6 +246,7 @@ extern const struct res_sym __p_type_syms[]; #define res_mkupdate __res_mkupdate #define res_mkupdrec __res_mkupdrec #define res_freeupdrec __res_freeupdrec +#endif __BEGIN_DECLS int res_hnok __P((const char *)); int res_ownok __P((const char *));