summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>1998-06-08 19:38:57 +0000
committerChristopher R. Hertel <crh@samba.org>1998-06-08 19:38:57 +0000
commit6d53920d8a94eae92a5f061eeb99b7cdfac76228 (patch)
tree7ca300ccc2a3c5fede064a7264b2c33d85ba1f86 /source3
parent072504985973be17f64a23aaaa99a8d3ef5b2ea6 (diff)
downloadsamba-6d53920d8a94eae92a5f061eeb99b7cdfac76228.tar.gz
samba-6d53920d8a94eae92a5f061eeb99b7cdfac76228.tar.bz2
samba-6d53920d8a94eae92a5f061eeb99b7cdfac76228.zip
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 -)----- (This used to be commit f128fda8e6abdbd9ae661dd17684580969ef5068)
Diffstat (limited to 'source3')
-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 */