tdb2: make tdb1 headers include tdb2 headers.

They're about to start sharing TDB2's definitions.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 1e3138a0ad0c184d2ca49ce7bc47173eb2fe67bd)

2 files changed, 4 insertions, 29 deletions

diff --git a/lib/tdb2/tdb1.h b/lib/tdb2/tdb1.h
index 9ffb57d9b5..8ce5fa9d07 100644
--- a/lib/tdb2/tdb1.h
+++ b/lib/tdb2/tdb1.h
@@ -26,6 +26,7 @@
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#include "tdb2.h"
 
 #ifndef _SAMBA_BUILD_
 /* For mode_t */
diff --git a/lib/tdb2/tdb1_private.h b/lib/tdb2/tdb1_private.h
index 809f135555..7ce192b9a6 100644
--- a/lib/tdb2/tdb1_private.h
+++ b/lib/tdb2/tdb1_private.h
@@ -25,37 +25,11 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _SAMBA_BUILD_
-#include "config.h"
-/* This keeps us consistent with TDB2 code. */
-#if HAVE_FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <stdio.h>
-#include <utime.h>
-#else
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-#include "system/shmem.h"
-#include "system/select.h"
-#include "system/wait.h"
-#endif
-
+#include "private.h"
 #include "tdb1.h"
 
+#include <limits.h>
+
 /* Temporary wrapper to avoid undue churn in test/ */
 #define tdb1_error(tdb) ((tdb)->ecode)