It occurred to me that the samba includes.h file should be included in the

header files used by the ubiqx modules, instead of being hidden in the .c
files.  This would ensure that anything in includes.h would be "seen" by
the ubiqx headers.  I also had to put an #ifdef around the includes for
ubi_SplayTree.h and ubi_Cache.h in includes.h to prevent the header of the
descendant type from being included before its parent type.

Chris -)-----
(This used to be commit e30a7e023b7491c01e052ae3dbd1788f84075413)

1 files changed, 21 insertions, 3 deletions

diff --git a/source3/ubiqx/ubi_BinTree.h b/source3/ubiqx/ubi_BinTree.h
index 19494d32ff..15b22df707 100644
--- a/source3/ubiqx/ubi_BinTree.h
+++ b/source3/ubiqx/ubi_BinTree.h
@@ -1,5 +1,5 @@
-#ifndef ubi_BinTree_H
-#define ubi_BinTree_H
+#ifndef UBI_BINTREE_H
+#define UBI_BINTREE_H
 /* ========================================================================== **
  *                              ubi_BinTree.h
  *
@@ -29,6 +29,18 @@
  * -------------------------------------------------------------------------- **
  *
  * Log: ubi_BinTree.h,v 
+ * Revision 4.4  1998/06/03 17:42:46  crh
+ * Further fiddling with sys_include.h.  It's now in ubi_BinTree.h which is
+ * included by all of the binary tree files.
+ *
+ * Reminder: Some of the ubi_tr* macros in ubi_BinTree.h are redefined in
+ *           ubi_AVLtree.h and ubi_SplayTree.h.  This allows easy swapping
+ *           of tree types by simply changing a header.  Unfortunately, the
+ *           macro redefinitions in ubi_AVLtree.h and ubi_SplayTree.h will
+ *           conflict if used together.  You must either choose a single tree
+ *           type, or use the underlying function calls directly.  Compare
+ *           the two header files for more information.
+ *
  * Revision 4.3  1998/06/02 01:28:43  crh
  * Changed ubi_null.h to sys_include.h to make it more generic.
  *
@@ -134,6 +146,12 @@
  * ========================================================================== **
  */
 
+#include "sys_include.h"  /* Global include file, used to adapt the ubiqx
+                           * modules to the host environment and the project
+                           * with which the modules will be used.  See
+                           * sys_include.h for more info.
+                           */
+
 /* -------------------------------------------------------------------------- **
  * Macros and constants.
  *
@@ -775,4 +793,4 @@ int ubi_btModuleID( int size, char *list[] );
 #define ubi_trModuleID( s, l ) ubi_btModuleID( s, l )
 
 /* ========================================================================== */
-#endif /* ubi_BinTree_H */
+#endif /* UBI_BINTREE_H */