From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Tue, 3 May 2005 14:09:06 +0000 (+0000)
Subject: headeraches
X-Git-Tag: release-0.50~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f07819a75deb96787c4152c468dbbee2844bb1d;p=thirdparty%2Fldns.git

headeraches
---

diff --git a/Makefile.in b/Makefile.in
index d10975ac..a51cc257 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ LIBDNS_HEADERS	=	ldns/error.h		\
 			ldns/rr_functions.h	\
 			ldns/ldns.h		\
 			ldns/dns.h		\
+			ldns/config.h		\
 			ldns/util.h
 PROG_SOURCES	=	mx.c chaos.c
 PROG_TARGETS	=	$(PROG_SOURCES:.c=)
@@ -153,7 +154,7 @@ realclean: clean docclean testclean libclean
 	rm -f config.status
 	rm -f config.log
 	rm -f Makefile
-	rm -f config.h
+	rm -f ldns/config.h
 	rm -f config.h.in
 	rm -f configure
 	rm -f config.sub
diff --git a/chaos.c b/chaos.c
index f06cf9c7..9a5bafcb 100644
--- a/chaos.c
+++ b/chaos.c
@@ -6,8 +6,6 @@
  * Licensed under the GPL version 2
  */
 
-#include <stdio.h>
-#include <config.h>
 #include <ldns/ldns.h>
 
 int
diff --git a/configure.ac b/configure.ac
index 43c01b90..256a0128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,5 +215,5 @@ time_t timegm (struct tm *tm);
 
 AC_CONFIG_FILES([Makefile 
                  ])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADER([ldns/config.h])
 AC_OUTPUT
diff --git a/dname.c b/dname.c
index dceb1464..1e0b1307 100644
--- a/dname.c
+++ b/dname.c
@@ -11,14 +11,8 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
-#include <ldns/rdata.h>
-#include <ldns/error.h>
-#include <ldns/str2host.h>
 #include <ldns/dns.h>
 
-#include "ldns/util.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/dnssec.c b/dnssec.c
index 65367d66..216ff6c8 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -10,8 +10,7 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <strings.h>
 
diff --git a/higher.c b/higher.c
index 4984c902..dd68ea7d 100644
--- a/higher.c
+++ b/higher.c
@@ -11,15 +11,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <openssl/ssl.h>
-#include <openssl/sha.h>
-#include <ldns/higher.h>
-#include <ldns/parse.h>
-#include <ldns/resolver.h>
 #include <ldns/dns.h>
 
-#include "ldns/util.h"
+#include <openssl/ssl.h>
+#include <openssl/sha.h>
 
 ldns_rr_list *
 ldns_get_rr_list_addr_by_name(ldns_resolver *res, ldns_rdf *name, ldns_rr_class c, 
diff --git a/host2str.c b/host2str.c
index 2f4c811f..4f864307 100644
--- a/host2str.c
+++ b/host2str.c
@@ -10,7 +10,7 @@
  *
  * See the file LICENSE for the license
  */
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <limits.h>
 
@@ -19,13 +19,6 @@
 #include <netdb.h>
 #include <time.h>
 
-#include <ldns/host2str.h>
-#include <ldns/packet.h>
-#include <ldns/wire2host.h>
-#include <ldns/dns.h>
-
-#include <ldns/util.h>
-
 /* lookup tables for standard DNS stuff  */
 
 /* Taken from RFC 2538, section 2.1.  */
diff --git a/keys.c b/keys.c
index c4b19e70..4aac413d 100644
--- a/keys.c
+++ b/keys.c
@@ -6,12 +6,10 @@
  * handling
  */
 
-#include <config.h>
+#include <ldns/dns.h>
+
 #include <openssl/ssl.h>
 
-#include <ldns/util.h>
-#include <ldns/dnssec.h>
-#include <ldns/keys.h>
 
 ldns_lookup_table ldns_signing_algorithms[] = {
         { LDNS_SIGN_RSAMD5, "RSAMD5" },
diff --git a/ldns/dns.h b/ldns/dns.h
index 5b5ae2e2..e25cc82d 100644
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -11,6 +11,7 @@
 #ifndef _DNS_H_
 #define _DNS_H_
 
+#include <ldns/config.h>
 #include <ldns/util.h>
 #include <ldns/buffer.h>
 #include <ldns/common.h>
diff --git a/net.c b/net.c
index 8a9d4b3f..401c5787 100644
--- a/net.c
+++ b/net.c
@@ -11,9 +11,7 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -22,8 +20,6 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include "ldns/util.h"
-
 ldns_status
 ldns_send(ldns_pkt **result, ldns_resolver *r, ldns_pkt *query_pkt)
 {
diff --git a/parse.c b/parse.c
index e6115ac7..ddc7f5e6 100644
--- a/parse.c
+++ b/parse.c
@@ -7,19 +7,12 @@
  * (c) NLnet Labs, 2005
  * See the file LICENSE for the license
  */
+#include <ldns/dns.h>
 
 
-#include <config.h>
-
 #include <limits.h>
 #include <strings.h>
 
-#include <ldns/parse.h>
-
-#include <ldns/rr.h>
-#include <ldns/dns.h>
-#include "ldns/util.h"
-
 ssize_t
 ldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del, char *data, 
 		const char *d_del)
diff --git a/rdata.c b/rdata.c
index 421bd0ee..70fb825e 100644
--- a/rdata.c
+++ b/rdata.c
@@ -10,12 +10,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-
+#include <ldns/dns.h>
 #include <ldns/rdata.h>
 #include <ldns/error.h>
 #include <ldns/str2host.h>
-#include <ldns/dns.h>
 
 #include "ldns/util.h"
 #include <netinet/in.h>
diff --git a/resolver.c b/resolver.c
index 58ffa681..f07182b8 100644
--- a/resolver.c
+++ b/resolver.c
@@ -10,15 +10,10 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <stdio.h>
-
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 #include <strings.h>
 
-#include "ldns/util.h"
-
 /* Access function for reading 
  * and setting the different Resolver 
  * options
diff --git a/rr.c b/rr.c
index a92f2ece..412377d2 100644
--- a/rr.c
+++ b/rr.c
@@ -10,17 +10,9 @@
  * (c) NLnet Labs, 2004
  * See the file LICENSE for the license
  */
-
-#include <config.h>
-
-#include <limits.h>
-#include <strings.h>
-
-#include <ldns/rr.h>
 #include <ldns/dns.h>
-#include <ldns/buffer.h>
 
-#include "ldns/util.h"
+#include <strings.h>
 
 ldns_rr *
 ldns_rr_new(void)
diff --git a/rr_functions.c b/rr_functions.c
index f198837f..25438d5e 100644
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -12,17 +12,11 @@
  * first the read variant, then the write
  */
 
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <limits.h>
 #include <strings.h>
 
-#include <ldns/rr.h>
-#include <ldns/dns.h>
-#include <ldns/rr_functions.h>
-
-#include "ldns/util.h"
-
 /**
  * return a specific rdf
  * \param[in] type type of RR
diff --git a/run-test0.c b/run-test0.c
index 21cb9cfb..bcb4c408 100644
--- a/run-test0.c
+++ b/run-test0.c
@@ -3,13 +3,8 @@
  *
  */
 
-#include <config.h>
-
-
 #include <ldns/ldns.h>
 
-#include "ldns/util.h"
-
 /*
 	0xc2, 0xb4, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,
 	0x00, 0x02, 0x00, 0x02, 0x03, 0x77, 0x77, 0x77,
diff --git a/run-test11.c b/run-test11.c
index 45e1b649..d04b80f9 100644
--- a/run-test11.c
+++ b/run-test11.c
@@ -6,9 +6,7 @@
  * Print the result
  */
 
-#include <config.h>
-#include <ldns/ldns.h>
-#include <ldns/dname.h>
+#include <ldns/dns.h>
 
 void
 print_usage(char *file)
diff --git a/run-test18.c b/run-test18.c
index 3fe05c43..a995aae3 100644
--- a/run-test18.c
+++ b/run-test18.c
@@ -3,9 +3,8 @@
  * for a particulary domain
  */
 
+#include <ldns/dns.h>
 #include <stdio.h>
-#include <config.h>
-#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {
diff --git a/run-test19.c b/run-test19.c
index c51de309..84959e60 100644
--- a/run-test19.c
+++ b/run-test19.c
@@ -3,9 +3,8 @@
  * for a particulary domain
  */
 
+#include <ldns/dns.h>
 #include <stdio.h>
-#include <config.h>
-#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {
diff --git a/run-test7.c b/run-test7.c
index 767862bc..4302e0bd 100644
--- a/run-test7.c
+++ b/run-test7.c
@@ -6,7 +6,6 @@
  * Print the result
  */
 
-#include <config.h>
 #include <ldns/dns.h>
 
 void
diff --git a/str2host.c b/str2host.c
index 212b6743..0d862d48 100644
--- a/str2host.c
+++ b/str2host.c
@@ -10,13 +10,7 @@
  *
  * See the file LICENSE for the license
  */
-#include <config.h>
-
-#include <ldns/str2host.h>
 #include <ldns/dns.h>
-#include <ldns/rdata.h>
-
-#include "ldns/util.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>