proto.h

  *Not* the usual.  I did make proto to add the #ifndef..#endif block.
  Just to be safe, I did a cvs diff and found no prototype changes.

ubiqx/sys_includes.h
  More fudging.  I want to use binary tree typdefs in nameserv.h, but
  nameserv.h is included in includes.h which is included by all of the
  ubiqx modules.  The result is that the types are referenced before
  they are declared.  My solution is to prevent nameserv.h and proto.h
  from being included in the ubiqx modules (where they are not needed
  anyway).

Chris -)-----

2 files changed, 16 insertions, 0 deletions

diff --git a/source/include/proto.h b/source/include/proto.h
index 737ae945715..030528c0327 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1,3 +1,5 @@
+#ifndef _PROTO_H_
+#define _PROTO_H_
 /* This file is automatically generated with "make proto". DO NOT EDIT */
 
 
@@ -2115,3 +2117,4 @@ void status_page(void);
 /*The following definitions come from  web/swat.c  */
 
 int main(int argc, char *argv[]);
+#endif /* _PROTO_H_ */
diff --git a/source/ubiqx/sys_include.h b/source/ubiqx/sys_include.h
index 95968346385..ea66d763804 100644
--- a/source/ubiqx/sys_include.h
+++ b/source/ubiqx/sys_include.h
@@ -32,7 +32,20 @@
  * ========================================================================== **
  */
 
+#ifndef _INCLUDES_H
+
+/* Block the inclusion of some Samba headers so that ubiqx types won't be
+ * used before the headers that define them.  These headers are not needed
+ * in the ubiqx modules anyway.
+ */
+#define _NAMESERV_H_
+#define _PROTO_H_
+
+/* The main Samba system-adaptive header file.
+ */
 #include "../includes.h"
 
+#endif /* _INCLUDES_H */
+
 /* ================================ The End ================================= */
 #endif /* SYS_INCLUDE_H */