I've put the ubiqx headers back into includes.h, and removed them from
authorChristopher R. Hertel <crh@samba.org>
Fri, 22 May 1998 07:46:39 +0000 (07:46 +0000)
committerChristopher R. Hertel <crh@samba.org>
Fri, 22 May 1998 07:46:39 +0000 (07:46 +0000)
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
source3/smbd/dir.c
source3/smbd/mangle.c

index eda5afbe4e5ca4a38bd6fd39e48c0bf2d53e918c..00f4e7ee0f472278d7b5e786ec5da95bd453bae3 100644 (file)
@@ -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 */
index 59ee23bbe8d474e361dec4c1627dbe3188115bdb..37fcd057430ea31a1b4cb8341a285f0eb15f4155 100644 (file)
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "ubiqx/ubi_dLinkList.h"
 
 extern int DEBUGLEVEL;
 extern connection_struct Connections[];
index e822894600fcbbafa1166b56bc93ad0f7e236fe9..33fc729a7ff364d0a80a2f1a18b1efb273807a29 100644 (file)
@@ -46,7 +46,6 @@
  */
 
 #include "includes.h"
-#include "ubiqx/ubi_Cache.h"
 
 
 /* -------------------------------------------------------------------------- **