From 778d24f5ba86b4fc0f6dd33d91566b78c074cd5c Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 28 Jun 2000 19:03:24 +0000 Subject: [PATCH] do not include isc/lang.h; rdatastructpre.h already gets it. no need to pull these changes up to the 9.0.0 branch. --- lib/dns/rdata/generic/opt_41.h | 6 ++++-- lib/dns/rdata/generic/txt_16.h | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index c8b0a8f78c..039cf006bc 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -18,7 +18,7 @@ #ifndef GENERIC_OPT_41_H #define GENERIC_OPT_41_H 1 -/* $Id: opt_41.h,v 1.8 2000/06/21 22:45:09 tale Exp $ */ +/* $Id: opt_41.h,v 1.9 2000/06/28 19:03:23 tale Exp $ */ /* RFC 2671 */ @@ -37,7 +37,9 @@ typedef struct dns_rdata_opt { isc_uint16_t offset; } dns_rdata_opt_t; -#include +/* + * isc/lang.h is included via rdatastructpre.h when gen builds rdatastruct.h. + */ ISC_LANG_BEGINDECLS diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index b3aa497b44..a1847c9ece 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -18,8 +18,7 @@ #ifndef GENERIC_TXT_16_H #define GENERIC_TXT_16_H 1 -/* $Id: txt_16.h,v 1.18 2000/06/21 22:45:21 tale Exp $ */ - +/* $Id: txt_16.h,v 1.19 2000/06/28 19:03:24 tale Exp $ */ typedef struct dns_rdata_txt_string { isc_uint8_t length; @@ -35,7 +34,9 @@ typedef struct dns_rdata_txt { isc_uint16_t offset; } dns_rdata_txt_t; -#include +/* + * isc/lang.h is included via rdatastructpre.h when gen builds rdatastruct.h. + */ ISC_LANG_BEGINDECLS