summaryrefslogtreecommitdiff
path: root/usr.sbin/bind/include
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-12-22 00:19:00 +0000
committerchristos <christos@NetBSD.org>2005-12-22 00:19:00 +0000
commitbd58506612aa0444531e6b490a3bd5ed85b10f0e (patch)
treed56537bb20a4e05bc91ef31f0930542620eaecaf /usr.sbin/bind/include
parente471bad6c5fc23cc4fa022fd16e91a93646724c9 (diff)
Resolve conflicts
Diffstat (limited to 'usr.sbin/bind/include')
-rw-r--r--usr.sbin/bind/include/config.h26
-rw-r--r--usr.sbin/bind/include/dns/code.h4
-rw-r--r--usr.sbin/bind/include/dns/enumclass.h4
-rw-r--r--usr.sbin/bind/include/dns/enumtype.h4
-rw-r--r--usr.sbin/bind/include/dns/rdatastruct.h104
-rw-r--r--usr.sbin/bind/include/lwres/platform.h16
6 files changed, 94 insertions, 64 deletions
diff --git a/usr.sbin/bind/include/config.h b/usr.sbin/bind/include/config.h
index 1ab2fa3ee3f..a2675b9d358 100644
--- a/usr.sbin/bind/include/config.h
+++ b/usr.sbin/bind/include/config.h
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.3 2005/01/10 03:01:18 lukem Exp $ */
+/* $NetBSD: config.h,v 1.4 2005/12/22 00:19:00 christos Exp $ */
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
@@ -19,7 +19,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: config.h.in,v 1.47.2.3.2.11 2004/09/01 07:18:30 marka Exp */
+/* Id: config.h.in,v 1.47.2.3.2.20 2005/10/20 23:57:38 marka Exp */
/***
*** This file is not to be included by any public header files, because
@@ -139,12 +139,18 @@ int sigwait(const unsigned int *set, int *sig);
/* define if you have strerror in the C library. */
#define HAVE_STRERROR 1
-/* Define if you are running under Compaq TruCluster.. */
+/* Define if you are running under Compaq TruCluster. */
/* #undef HAVE_TRUCLUSTER */
/* Define if OpenSSL includes DSA support */
#define HAVE_OPENSSL_DSA 1
+/* Define to the length type used by the socket API (socklen_t, size_t, int). */
+#define ISC_SOCKADDR_LEN_T socklen_t
+
+/* Define if threads need PTHREAD_SCOPE_SYSTEM */
+/* #undef NEED_PTHREAD_SCOPE_SYSTEM */
+
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
@@ -223,6 +229,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Defined if extern char *optarg is not declared. */
+/* #undef NEED_OPTARG */
+
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -238,12 +247,20 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
+/* Sets which flag to pass to open/fcntl to make non-blocking
+ (O_NDELAY/O_NONBLOCK). */
+#define PORT_NONBLOCK O_NONBLOCK
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
+/* Defined if you need to use ioctl(FIONBIO) instead a fcntl call to make
+ non-blocking. */
+/* #undef USE_FIONBIO_IOCTL */
+
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#include <sys/endian.h>
@@ -265,3 +282,6 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to `int' if <sys/types.h> does not define. */
/* #undef ssize_t */
+
+/* Define to `unsigned long' if <sys/types.h> does not define. */
+/* #undef uintptr_t */
diff --git a/usr.sbin/bind/include/dns/code.h b/usr.sbin/bind/include/dns/code.h
index 26d7af2a3f2..fb0faf3bf8b 100644
--- a/usr.sbin/bind/include/dns/code.h
+++ b/usr.sbin/bind/include/dns/code.h
@@ -1,7 +1,7 @@
-/* $NetBSD: code.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: code.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/usr.sbin/bind/include/dns/enumclass.h b/usr.sbin/bind/include/dns/enumclass.h
index af912a1fccc..71fa5f37c3d 100644
--- a/usr.sbin/bind/include/dns/enumclass.h
+++ b/usr.sbin/bind/include/dns/enumclass.h
@@ -1,7 +1,7 @@
-/* $NetBSD: enumclass.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: enumclass.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/usr.sbin/bind/include/dns/enumtype.h b/usr.sbin/bind/include/dns/enumtype.h
index c7bd1762e71..d65ddf8879d 100644
--- a/usr.sbin/bind/include/dns/enumtype.h
+++ b/usr.sbin/bind/include/dns/enumtype.h
@@ -1,7 +1,7 @@
-/* $NetBSD: enumtype.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: enumtype.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/usr.sbin/bind/include/dns/rdatastruct.h b/usr.sbin/bind/include/dns/rdatastruct.h
index 528294e4911..05d1a8e96d2 100644
--- a/usr.sbin/bind/include/dns/rdatastruct.h
+++ b/usr.sbin/bind/include/dns/rdatastruct.h
@@ -1,7 +1,7 @@
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -24,7 +24,7 @@
***************
***************/
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -68,7 +68,7 @@ typedef struct dns_rdatacommon {
(_data)->common.rdclass = (_rdclass); \
ISC_LINK_INIT(&(_data)->common, link); \
} while (0)
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -98,7 +98,7 @@ typedef struct dns_rdata_in_a {
} dns_rdata_in_a_t;
#endif /* IN_1_A_1_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -128,7 +128,7 @@ typedef struct dns_rdata_hs_a {
} dns_rdata_hs_a_t;
#endif /* HS_4_A_1_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -160,7 +160,7 @@ typedef struct dns_rdata_ns {
#endif /* GENERIC_NS_2_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -192,7 +192,7 @@ typedef struct dns_rdata_md {
#endif /* GENERIC_MD_3_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -223,7 +223,7 @@ typedef struct dns_rdata_mf {
} dns_rdata_mf_t;
#endif /* GENERIC_MF_4_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -254,7 +254,7 @@ typedef struct dns_rdata_cname {
} dns_rdata_cname_t;
#endif /* GENERIC_CNAME_5_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -292,7 +292,7 @@ typedef struct dns_rdata_soa {
#endif /* GENERIC_SOA_6_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -323,7 +323,7 @@ typedef struct dns_rdata_mb {
} dns_rdata_mb_t;
#endif /* GENERIC_MB_7_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -354,7 +354,7 @@ typedef struct dns_rdata_mg {
} dns_rdata_mg_t;
#endif /* GENERIC_MG_8_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -385,7 +385,7 @@ typedef struct dns_rdata_mr {
} dns_rdata_mr_t;
#endif /* GENERIC_MR_9_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -418,7 +418,7 @@ typedef struct dns_rdata_null {
#endif /* GENERIC_NULL_10_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -452,7 +452,7 @@ typedef struct dns_rdata_in_wks {
} dns_rdata_in_wks_t;
#endif /* IN_1_WKS_11_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -483,7 +483,7 @@ typedef struct dns_rdata_ptr {
} dns_rdata_ptr_t;
#endif /* GENERIC_PTR_12_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -517,7 +517,7 @@ typedef struct dns_rdata_hinfo {
} dns_rdata_hinfo_t;
#endif /* GENERIC_HINFO_13_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -549,7 +549,7 @@ typedef struct dns_rdata_minfo {
} dns_rdata_minfo_t;
#endif /* GENERIC_MINFO_14_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -581,7 +581,7 @@ typedef struct dns_rdata_mx {
} dns_rdata_mx_t;
#endif /* GENERIC_MX_15_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -634,7 +634,7 @@ isc_result_t
dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *);
#endif /* GENERIC_TXT_16_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -669,7 +669,7 @@ typedef struct dns_rdata_rp {
#endif /* GENERIC_RP_17_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -704,7 +704,7 @@ typedef struct dns_rdata_afsdb {
#endif /* GENERIC_AFSDB_18_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -738,7 +738,7 @@ typedef struct dns_rdata_x25 {
} dns_rdata_x25_t;
#endif /* GENERIC_X25_19_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -774,7 +774,7 @@ typedef struct dns_rdata_isdn {
} dns_rdata_isdn_t;
#endif /* GENERIC_ISDN_20_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -808,7 +808,7 @@ typedef struct dns_rdata_rt {
} dns_rdata_rt_t;
#endif /* GENERIC_RT_21_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -842,7 +842,7 @@ typedef struct dns_rdata_in_nsap {
} dns_rdata_in_nsap_t;
#endif /* IN_1_NSAP_22_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -875,7 +875,7 @@ typedef struct dns_rdata_in_nsap_ptr {
} dns_rdata_in_nsap_ptr_t;
#endif /* IN_1_NSAP_PTR_23_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -918,7 +918,7 @@ typedef struct dns_rdata_sig_t {
#endif /* GENERIC_SIG_24_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -956,7 +956,7 @@ typedef struct dns_rdata_key_t {
#endif /* GENERIC_KEY_25_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -991,7 +991,7 @@ typedef struct dns_rdata_in_px {
} dns_rdata_in_px_t;
#endif /* IN_1_PX_26_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1029,7 +1029,7 @@ typedef struct dns_rdata_gpos {
} dns_rdata_gpos_t;
#endif /* GENERIC_GPOS_27_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1061,7 +1061,7 @@ typedef struct dns_rdata_in_aaaa {
} dns_rdata_in_aaaa_t;
#endif /* IN_1_AAAA_28_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1105,7 +1105,7 @@ typedef struct dns_rdata_loc {
} dns_rdata_loc_t;
#endif /* GENERIC_LOC_29_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1140,7 +1140,7 @@ typedef struct dns_rdata_nxt {
} dns_rdata_nxt_t;
#endif /* GENERIC_NXT_30_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1178,7 +1178,7 @@ typedef struct dns_rdata_in_srv {
} dns_rdata_in_srv_t;
#endif /* IN_1_SRV_33_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1219,7 +1219,7 @@ typedef struct dns_rdata_in_naptr {
} dns_rdata_in_naptr_t;
#endif /* IN_1_NAPTR_35_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1253,7 +1253,7 @@ typedef struct dns_rdata_in_kx {
} dns_rdata_in_kx_t;
#endif /* IN_1_KX_36_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1289,7 +1289,7 @@ typedef struct dns_rdata_cert {
} dns_rdata_cert_t;
#endif /* GENERIC_CERT_37_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1324,7 +1324,7 @@ typedef struct dns_rdata_in_a6 {
} dns_rdata_in_a6_t;
#endif /* IN_1_A6_38_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1357,7 +1357,7 @@ typedef struct dns_rdata_dname {
} dns_rdata_dname_t;
#endif /* GENERIC_DNAME_39_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1413,7 +1413,7 @@ isc_result_t
dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *);
#endif /* GENERIC_OPT_41_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1470,7 +1470,7 @@ isc_result_t
dns_rdata_apl_current(dns_rdata_in_apl_t *, dns_rdata_apl_ent_t *);
#endif /* IN_1_APL_42_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1506,7 +1506,7 @@ typedef struct dns_rdata_ds {
} dns_rdata_ds_t;
#endif /* GENERIC_DS_43_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1542,7 +1542,7 @@ typedef struct dns_rdata_sshfp {
} dns_rdata_sshfp_t;
#endif /* GENERIC_SSHFP_44_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1584,7 +1584,7 @@ typedef struct dns_rdata_rrsig {
#endif /* GENERIC_DNSSIG_46_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1619,7 +1619,7 @@ typedef struct dns_rdata_nsec {
} dns_rdata_nsec_t;
#endif /* GENERIC_NSEC_47_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1657,7 +1657,7 @@ typedef struct dns_rdata_dnskey {
#endif /* GENERIC_DNSKEY_48_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1689,7 +1689,7 @@ typedef struct dns_rdata_unspec_t {
} dns_rdata_unspec_t;
#endif /* GENERIC_UNSPEC_103_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1731,7 +1731,7 @@ typedef struct dns_rdata_tkey {
#endif /* GENERIC_TKEY_249_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1772,7 +1772,7 @@ typedef struct dns_rdata_any_tsig {
} dns_rdata_any_tsig_t;
#endif /* ANY_255_TSIG_250_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -1807,7 +1807,7 @@ typedef struct dns_rdata_dlv {
} dns_rdata_dlv_t;
#endif /* GENERIC_DLV_65323_H */
-/* $NetBSD: rdatastruct.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: rdatastruct.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
* Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
diff --git a/usr.sbin/bind/include/lwres/platform.h b/usr.sbin/bind/include/lwres/platform.h
index d0db684c770..c99319f35ce 100644
--- a/usr.sbin/bind/include/lwres/platform.h
+++ b/usr.sbin/bind/include/lwres/platform.h
@@ -1,7 +1,7 @@
-/* $NetBSD: platform.h,v 1.2 2004/11/07 01:13:32 christos Exp $ */
+/* $NetBSD: platform.h,v 1.3 2005/12/22 00:19:00 christos Exp $ */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: platform.h.in,v 1.12.2.1.10.2 2004/08/28 06:25:26 marka Exp */
+/* Id: platform.h.in,v 1.12.2.1.10.5 2005/06/08 02:08:32 marka Exp */
#ifndef LWRES_PLATFORM_H
#define LWRES_PLATFORM_H 1
@@ -90,6 +90,16 @@
*/
#undef LWRES_PLATFORM_NEEDSPRINTF
+/*
+ * The printf format string modifier to use with lwres_uint64_t values.
+ */
+#define LWRES_PLATFORM_QUADFORMAT "ll"
+
+/*! \brief
+ * Define if this system needs strtoul.
+ */
+#undef ISC_PLATFORM_NEEDSTRTOUL
+
#ifndef LWRES_PLATFORM_USEDECLSPEC
#define LIBLWRES_EXTERNAL_DATA
#else