From cfc43a5a2fe65cccd9902bc28441da6c8d29f6a0 Mon Sep 17 00:00:00 2001
From: "Christopher R. Hertel" <crh@samba.org>
Date: Fri, 22 May 1998 07:46:39 +0000
Subject: I've put the ubiqx headers back into includes.h, and removed them
 from dir.c & mangle.c.  This was possible after I checked the tree code to
 make sure that the tree code did not reference functions by macro name. 
 Also, note that the AVL module has been removed to prevent conflict with the
 SplayTree macro defines.

Chris -)-----
(This used to be commit a1f4c8567c3c5264cbfa99867fa894cafab7da81)
---
 source3/include/includes.h | 10 +++++++++-
 source3/smbd/dir.c         |  1 -
 source3/smbd/mangle.c      |  1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index eda5afbe4e..00f4e7ee0f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1385,4 +1385,12 @@ extern int errno;
 #endif /* MEM_MAN */
 
 
-#endif
+/* -------------------------------------------------------------------------- **
+ * Lists, trees, and caches...
+ */
+#include "ubiqx/ubi_sLinkList.h"
+#include "ubiqx/ubi_dLinkList.h"
+#include "ubiqx/ubi_SplayTree.h"
+#include "ubiqx/ubi_Cache.h"
+
+#endif /* _INCLUDES_H */
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 59ee23bbe8..37fcd05743 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "ubiqx/ubi_dLinkList.h"
 
 extern int DEBUGLEVEL;
 extern connection_struct Connections[];
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index e822894600..33fc729a7f 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -46,7 +46,6 @@
  */
 
 #include "includes.h"
-#include "ubiqx/ubi_Cache.h"
 
 
 /* -------------------------------------------------------------------------- **
-- 
cgit