From b12a4dd9b655485420d5c67dd143d8f49ac28a40 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Sep 2001 12:14:18 +0000
Subject: declare dbf in one spot (This used to be commit
 f41c3bb80f1e498a9d27f6e236b0ff3a742764c9)

---
 source3/include/debug.h    | 2 ++
 source3/include/includes.h | 2 +-
 source3/include/xfile.h    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'source3/include')

diff --git a/source3/include/debug.h b/source3/include/debug.h
index 0bde9e69cf..cad802d8ca 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -40,6 +40,8 @@
 int  Debug1( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 BOOL dbgtext( char *, ... ) PRINTF_ATTRIBUTE(1,2);
 
+extern XFILE *dbf;
+
 /* If we have these macros, we can add additional info to the header. */
 #ifdef HAVE_FILE_MACRO
 #define FILE_MACRO (__FILE__)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1f97a2d7ed..8cb587209c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -626,6 +626,7 @@ extern int errno;
 #endif
 
 /* Lists, trees, caching, database... */
+#include "xfile.h"
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
@@ -640,7 +641,6 @@ extern int errno;
 #include "messages.h"
 #include "util_list.h"
 #include "charset.h"
-#include "xfile.h"
 
 #include "util_getent.h"
 
diff --git a/source3/include/xfile.h b/source3/include/xfile.h
index 16390b49aa..fa4752fe30 100644
--- a/source3/include/xfile.h
+++ b/source3/include/xfile.h
@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef _XFILE_H_
+#define _XFILE_H_
 /*
   see xfile.c for explanations
 */
@@ -42,3 +44,5 @@ extern XFILE *x_stdin, *x_stdout, *x_stderr;
 #define X_IONBF 2
 
 #define x_getc(f) x_fgetc(f)
+
+#endif /* _XFILE_H_ */
-- 
cgit