Fix builds with external talloc

[ira/wip.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7bb72be69233363a9fadcd39ad51be2b4838f4e9..b3446cbf65abe1787251cd1104327ac2ba28f2bc 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -207,7 +207,11 @@ typedef int ber_int_t;
 #endif
 
 #ifndef ENOATTR
+#if defined(ENODATA)
 #define ENOATTR ENODATA
+#else
+#define ENOATTR ENOENT
+#endif
 #endif
 
 /* mutually exclusive (SuSE 8.2) */
@@ -313,8 +317,10 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
 
 #if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H)
 #  define int32 int32_t
-   /* needed to work around compile issue on HP-UX 11.x */
-#  define _INT32       1
+#  ifndef _INT32
+     /* needed to work around compile issue on HP-UX 11.x */
+#    define _INT32     1
+#  endif
 #endif
 
 /*
@@ -433,12 +439,12 @@ typedef uint64_t br_off;
 
 #ifndef HAVE_BLKSIZE_T
 /* This is mainly for HP/UX which defines st_blksize as long */
-typedef blksize_t long;
+typedef long blksize_t;
 #endif
 
 #ifndef HAVE_BLKCNT_T
 /* This is mainly for HP/UX which doesn't have blkcnt_t */
-typedef blkcnt_t long;
+typedef long blkcnt_t;
 #endif
 
 /*
@@ -458,6 +464,8 @@ struct stat_ex {
        struct timespec st_ex_mtime;
        struct timespec st_ex_ctime;
        struct timespec st_ex_btime; /* birthtime */
+       /* Is birthtime real, or was it calculated ? */
+       bool            st_ex_calculated_birthtime;
        blksize_t       st_ex_blksize;
        blkcnt_t        st_ex_blocks;
 
@@ -558,6 +566,12 @@ struct timespec {
 };
 #endif
 
+enum timestamp_set_resolution {
+       TIMESTAMP_SET_SECONDS = 0,
+       TIMESTAMP_SET_MSEC,
+       TIMESTAMP_SET_NT_OR_BETTER
+};
+
 #ifdef HAVE_BROKEN_GETGROUPS
 #define GID_T int
 #else
@@ -598,6 +612,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 
 /* Lists, trees, caching, database... */
 #include "../lib/util/util.h"
+#include "../lib/util/util_net.h"
 #include "../lib/util/xfile.h"
 #include "../lib/util/memory.h"
 #include "../lib/util/attr.h"
@@ -606,11 +621,12 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "tdb.h"
 #include "util_tdb.h"
 
-#include "../talloc/talloc.h"
+#include "talloc.h"
 
 #include "event.h"
 #include "../lib/util/tevent_unix.h"
 #include "../lib/util/tevent_ntstatus.h"
+#include "../lib/tsocket/tsocket.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
@@ -638,6 +654,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "privileges.h"
 #include "rpc_misc.h"
 #include "rpc_dce.h"
+#include "../librpc/gen_ndr/schannel.h"
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
@@ -655,8 +672,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ntdomain.h"
 #include "reg_objects.h"
 #include "reg_db.h"
-#include "rpc_perfcount.h"
-#include "rpc_perfcount_defs.h"
+#include "librpc/gen_ndr/perfcount.h"
 #include "librpc/gen_ndr/notify.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/messaging.h"
@@ -671,7 +687,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "mangle.h"
 #include "module.h"
 #include "nsswitch/winbind_client.h"
-#include "spnego.h"
 #include "rpc_client.h"
 #include "dbwrap.h"
 #include "packet.h"
@@ -680,10 +695,13 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "memcache.h"
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.h"
+#include "talloc_dict.h"
 #include "services.h"
 #include "eventlog.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
+#include "tldap.h"
+#include "tldap_util.h"
 
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
@@ -793,7 +811,7 @@ enum flush_reason_enum {
 #endif
 
 #ifndef SIGRTMIN
-#define SIGRTMIN 32
+#define SIGRTMIN NSIG
 #endif
 
 #ifndef MAP_FILE
@@ -1105,4 +1123,7 @@ void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
                                  struct in6_addr ip);
 #endif
 
+/* samba3 doesn't use uwrap yet */
+#define uwrap_enabled() 0
+
 #endif /* _INCLUDES_H */