make the UID_WRAPPER skip checks at runtime

[sfrench/samba-autobuild/.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index d78f297aa639c119ff61f5a017d62bae6b619eef..e94c0fe633906afbd7d4108d1b976fd7ba9aba00 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "lib/replace/replace.h"
+#include "../replace/replace.h"
 
 /* make sure we have included the correct config.h */
 #ifndef NO_CONFIG_H /* for some tests */
@@ -30,37 +30,56 @@
 #endif
 #endif /* NO_CONFIG_H */
 
-#include "local.h"
-
 #include "system/time.h"
 #include "system/wait.h"
 
+/* only do the C++ reserved word check when we compile
+   to include --with-developer since too many systems
+   still have comflicts with their header files (e.g. IRIX 6.4) */
+
+#if !defined(__cplusplus) && defined(DEVELOPER)
+#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#endif
+
 /* Lists, trees, caching, database... */
-#include <stdlib.h>
-#include <stdbool.h>
 #include <talloc.h>
-#include "libcli/util/nt_status.h"
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "charset/charset.h"
-#include "util/util.h"
-#include "librpc/gen_ndr/misc.h"
-
-typedef bool BOOL;
+#include "../lib/util/xfile.h"
+#include "../lib/util/attr.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/util.h"
 
-#define False false
-#define True true
-
-struct smbcli_tree;
 #include "libcli/util/error.h"
 
 /* String routines */
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
+
+/* Thread functions. */
+#include "../lib/util/smb_threads.h"
+#include "../lib/util/smb_threads_internal.h"
 
 #if 0
 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
 #define TALLOC_ABORT(reason) smb_panic(reason)
 #endif
 
+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+
 #endif /* _INCLUDES_H */