r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need

[vlendec/samba-autobuild/.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 59e8e5cd0fb908a003bb80ac20e77392cd71d476..ab2f6a96410e4736f453db44313c00e637e574c8 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -101,6 +101,10 @@
 #include <stdint.h>
 #endif
 
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
@@ -873,6 +877,11 @@ struct timespec {
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
+#ifndef _BOOL
+typedef int BOOL;
+#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
+#endif
+
 #ifndef HAVE_STRERROR
 extern char *sys_errlist[];
 #define strerror(i) sys_errlist[i]
@@ -905,8 +914,8 @@ extern int errno;
 #include "intl.h"
 #include "dlinklist.h"
 #include "tdb/tdb.h"
-#include "tdb/spinlock.h"
 #include "tdb/tdbutil.h"
+#include "tdb/tdbback.h"
 
 #include "talloc.h"
 /* And a little extension. Abort on type mismatch */
@@ -961,6 +970,7 @@ extern int errno;
 #include "rpc_ds.h"
 #include "rpc_echo.h"
 #include "rpc_shutdown.h"
+#include "rpc_unixinfo.h"
 #include "rpc_perfcount.h"
 #include "rpc_perfcount_defs.h"
 #include "nt_printing.h"
@@ -981,6 +991,8 @@ extern int errno;
 #include "rpc_client.h"
 #include "event.h"
 
+#include "libndr/libndr.h"
+
 /*
  * Type for wide character dirent structure.
  * Only d_name is defined by POSIX.
@@ -1054,6 +1066,10 @@ enum flush_reason_enum {
     /* NUM_FLUSH_REASONS must remain the last value in the enumeration. */
     NUM_FLUSH_REASONS};
 
+#ifndef HAVE_COMPARISON_FN_T
+typedef int (*comparison_fn_t)(const void *, const void *);
+#endif
+
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
 #include "proto.h"