summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source3/include/proto.h3
-rw-r--r--source3/ubiqx/sys_include.h13
2 files changed, 16 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 737ae94571..030528c032 100644
--- a/source3/include/proto.h
+++ b/source3/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/source3/ubiqx/sys_include.h b/source3/ubiqx/sys_include.h
index 9596834638..ea66d76380 100644
--- a/source3/ubiqx/sys_include.h
+++ b/source3/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 */