Stop including <lmdb.h> from <dns/lmdb.h>

The lmdb.h header doesn't have to be included from the dns/lmdb.h
header as it can be separately included where used.  This stops
exposing the inclusion of lmdb.h from the libdns headers.

diff --git a/bin/named/server.c b/bin/named/server.c
index 8a8ed1cc9d66df0961514ecd9901cd120989a320..fa488025f981f8065df7aef52f48a868072f32e3 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -132,6 +132,8 @@
 #endif /* ifdef HAVE_LIBSCF */
 
 #ifdef HAVE_LMDB
+#include <lmdb.h>
+
 #include <dns/lmdb.h>
 #define count_newzones    count_newzones_db
 #define configure_newzones configure_newzones_db

diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c
index 4bd20f2ddf161372d56f470d8bee568dd0dcf94b..ff622c16ae4e65c46cf5521bc96836eab8223970 100644 (file)
--- a/bin/tools/named-nzd2nzf.c
+++ b/bin/tools/named-nzd2nzf.c
@@ -13,6 +13,7 @@
 #error This program requires the LMDB library.
 #endif /* ifndef HAVE_LMDB */
 
+#include <lmdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/lib/dns/include/dns/lmdb.h b/lib/dns/include/dns/lmdb.h
index d69389faaa6346fe50aa2773f7e1a6c6285de662..768bf770d9365a20b1ab1f93705be1191b61572b 100644 (file)
--- a/lib/dns/include/dns/lmdb.h
+++ b/lib/dns/include/dns/lmdb.h
@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <lmdb.h>
 #define DNS_LMDB_COMMON_FLAGS (MDB_CREATE | MDB_NOSUBDIR | MDB_NOLOCK)
 #ifndef __OpenBSD__
 #define DNS_LMDB_FLAGS (DNS_LMDB_COMMON_FLAGS)

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 49f3eca261fb90df796dcb5231f0963885896ee2..035dedd1a320dae826a970d132f1f48c79e7e113 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -16,6 +16,8 @@
 #include <stdbool.h>
 
 #ifdef HAVE_LMDB
+#include <lmdb.h>
+
 #include <dns/lmdb.h>
 #endif /* HAVE_LMDB */