pyldb: avoid segfault when adding an element with no name

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

diff --git a/source4/include/includes.h b/source4/include/includes.h
index ddda21f9d8efa55c0ef350393828369995662d4a..39b0494342043e7f59f0767de2d73ce01b4fcce0 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -32,12 +32,13 @@
 
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/locale.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)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
@@ -54,23 +55,22 @@
 #ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
-#include "../lib/util/xfile.h"
 #include "../lib/util/attr.h"
+
+/* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */
 #include "../lib/util/debug.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 
 #include "libcli/util/error.h"
 
 /* String routines */
 #include "../lib/util/safe_string.h"
 
-#ifndef CONST_DISCARD
-#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
-#endif
+/* 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
+/* samba_setXXid functions. */
+#include "../lib/util/setid.h"
 
 #endif /* _INCLUDES_H */