removed ldns/ldns.h. That roll is taken over by ldns/dns.h. Fixed the includes

diff --git a/chaos.c b/chaos.c
index 9a5bafcb2dd1dfc6276bbe0fe70c9ad610d4ed8f..27a08654f97642008537fafebbb66c420a4e169e 100644 (file)
--- a/chaos.c
+++ b/chaos.c
@@ -6,7 +6,7 @@
  * Licensed under the GPL version 2
  */
 
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/compat/b64_ntop.c b/compat/b64_ntop.c
index 4f44cec8bacdd753d84ea3a998c1f058128a07b3..1e2296109cec86de77bee77474e1c53662a3b17d 100644 (file)
--- a/compat/b64_ntop.c
+++ b/compat/b64_ntop.c
@@ -39,7 +39,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/compat/b64_pton.c b/compat/b64_pton.c
index b69bb21bfe3d9031b914688bbef82d10f2a246d6..9b8b1bc30861ff6337bc6e648b736489b08ddd3c 100644 (file)
--- a/compat/b64_pton.c
+++ b/compat/b64_pton.c
@@ -39,7 +39,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
-#include <config.h>
+#include <ldns/dns.h>
 
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/host2wire.c b/host2wire.c
index 0dd5b4c2e7dd912e4272f0ae823a49c39497bd7f..e76f6d03d7e6f72723bffb0bcaa0b7407ed61522 100644 (file)
--- a/host2wire.c
+++ b/host2wire.c
@@ -12,8 +12,7 @@
  * See the file LICENSE for the license
  */
 
-#include <config.h>
-#include <ldns/host2wire.h>
+#include <ldns/dns.h>
 
 /* TODO 
   add a pointer to a 'possiblecompression' structure

diff --git a/ldns/dns.h b/ldns/dns.h
index e25cc82d2acc22003695425055b993f8bf84a628..a728728a2f792eec13aeb3b36b8c5c109d5705af 100644 (file)
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -21,7 +21,6 @@
 #include <ldns/higher.h>
 #include <ldns/host2str.h>
 #include <ldns/host2wire.h>
-#include <ldns/ldns.h>
 #include <ldns/net.h>
 #include <ldns/packet.h>
 #include <ldns/rdata.h>
@@ -31,6 +30,7 @@
 #include <ldns/wire2host.h>
 #include <ldns/rr_functions.h>
 #include <ldns/keys.h>
+#include <ldns/parse.h>
 
 #define LDNS_IP4ADDRLEN      (32/8)
 #define LDNS_IP6ADDRLEN      (128/8)

diff --git a/ldns/error.h b/ldns/error.h
index 8564b4737ff8e531cba2fda24a8b09ce624919b1..701e1309f7482a483748dc27a0ddb291717bb271 100644 (file)
--- a/ldns/error.h
+++ b/ldns/error.h
@@ -13,7 +13,7 @@
 #ifndef _ERROR_H
 #define _ERROR_H
 
-#include "ldns/util.h"
+#include <ldns/util.h>
 
 enum ldns_enum_status 
 {

diff --git a/ldns/ldns.h b/ldns/ldns.h
deleted file mode 100644 (file)
index df54e5f..0000000
--- a/ldns/ldns.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * ldns.h
- *
- * Main include files for LDNS clients.
- *
- * a Net::DNS like library for C
- *
- * (c) NLnet Labs, 2004
- *
- * See the file LICENSE for the license
- */
-
-#ifndef _LDNS_H
-#define _LDNS_H
-
-#include <ldns/common.h>
-#include <ldns/error.h>
-#include <ldns/rdata.h>
-#include <ldns/rr.h>
-#include <ldns/packet.h>
-#include <ldns/wire2host.h>
-#include <ldns/host2str.h>
-#include <ldns/resolver.h>
-#include <ldns/dns.h>
-#include <ldns/net.h>
-#include <ldns/dnssec.h>
-#include <ldns/keys.h>
-#include <ldns/rr_functions.h>
-#include <ldns/parse.h>
-
-#endif /* _LDNS_H */

diff --git a/mx.c b/mx.c
index b489518bbc2acc6624584d24c5a0969ed0f350c2..18ae172090f4c5ebc03043d057f476b8002c66ed 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -5,9 +5,7 @@
  * Licensed under the GPL version 2
  */
 
-#include <stdio.h>
-#include <config.h>
-#include <ldns/ldns.h>
+#include <ldns/dns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/rdata.c b/rdata.c
index 70fb825e7aaa63ec48884cb5cab95c44f2a3b3da..3bc28cab8f2277c21021b98e13209ad18097a33e 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -14,8 +14,8 @@
 #include <ldns/rdata.h>
 #include <ldns/error.h>
 #include <ldns/str2host.h>
+#include <ldns/util.h>
 
-#include "ldns/util.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/wire2host.c b/wire2host.c
index 7f175a13e47126bf3ef27314b459c6f571a2a342..c249288f368691ecb58365559ec99c934040623e 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -15,7 +15,7 @@
 
 
 #include <ldns/dns.h>
-#include <ldns/wire2host.h>
+/*#include <ldns/wire2host.h>*/
 
 #include <strings.h>
 #include <limits.h>