summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-10 12:14:18 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-10 12:14:18 +0000
commitb12a4dd9b655485420d5c67dd143d8f49ac28a40 (patch)
treef3287d94613da998004ba84180c9e4318b91c1d7 /source3/include
parent162e975514d71d98b42df579ab561da51a095e7b (diff)
downloadsamba-b12a4dd9b655485420d5c67dd143d8f49ac28a40.tar.gz
samba-b12a4dd9b655485420d5c67dd143d8f49ac28a40.tar.xz
samba-b12a4dd9b655485420d5c67dd143d8f49ac28a40.zip
declare dbf in one spot
(This used to be commit f41c3bb80f1e498a9d27f6e236b0ff3a742764c9)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/debug.h2
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/xfile.h4
3 files changed, 7 insertions, 1 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 0bde9e69cff..cad802d8ca3 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 1f97a2d7ed9..8cb587209c8 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 16390b49aa8..fa4752fe30b 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_ */