do not redefine _INT32

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

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4bf4b5c7357037e125e097c8239c2167da24aad2..2b36d18257df548129d8b403d49ef69afad02387 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -313,8 +313,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
 
 /*
@@ -431,17 +433,49 @@ typedef uint64_t br_off;
 #define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint32)(IVAL((buf),(off)))) & 0xFFFFFFFF )))
 #endif
 
+#ifndef HAVE_BLKSIZE_T
+/* This is mainly for HP/UX which defines st_blksize as long */
+typedef long blksize_t;
+#endif
+
+#ifndef HAVE_BLKCNT_T
+/* This is mainly for HP/UX which doesn't have blkcnt_t */
+typedef long blkcnt_t;
+#endif
+
 /*
  * Type for stat structure.
  */
 
-#ifndef SMB_STRUCT_STAT
-#  if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STAT64) && defined(HAVE_OFF64_T)
-#    define SMB_STRUCT_STAT struct stat64
-#  else
-#    define SMB_STRUCT_STAT struct stat
-#  endif
-#endif
+struct stat_ex {
+       dev_t           st_ex_dev;
+       ino_t           st_ex_ino;
+       mode_t          st_ex_mode;
+       nlink_t         st_ex_nlink;
+       uid_t           st_ex_uid;
+       gid_t           st_ex_gid;
+       dev_t           st_ex_rdev;
+       off_t           st_ex_size;
+       struct timespec st_ex_atime;
+       struct timespec st_ex_mtime;
+       struct timespec st_ex_ctime;
+       struct timespec st_ex_btime; /* birthtime */
+       blksize_t       st_ex_blksize;
+       blkcnt_t        st_ex_blocks;
+
+       uint32_t        st_ex_flags;
+       uint32_t        st_ex_mask;
+
+       /*
+        * Add space for VFS internal extensions. The initial user of this
+        * would be the onefs modules, passing the snapid from the stat calls
+        * to the file_id_create call. Maybe we'll have to expand this later,
+        * but the core of Samba should never look at this field.
+        */
+       uint64_t vfs_private;
+};
+
+typedef struct stat_ex SMB_STRUCT_STAT;
 
 /*
  * Type for dirent structure.
@@ -579,6 +613,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #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"
@@ -598,6 +633,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
+#include "smb_signing.h"
 #include "smb.h"
 #include "nameserv.h"
 #include "secrets.h"
@@ -608,7 +644,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "mapping.h"
 #include "passdb.h"
 #include "rpc_secdes.h"
-#include "gpo.h"
+#include "../libgpo/gpo.h"
 #include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"
@@ -645,11 +681,14 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
 #include "memcache.h"
-#include "../lib/async_req/async_req_ntstatus.h"
 #include "async_smb.h"
 #include "../lib/async_req/async_sock.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"
@@ -700,6 +739,7 @@ enum flush_reason_enum {
 #endif
 #include "libcli/security/secace.h"
 #include "libcli/security/secacl.h"
+#include "libcli/security/security_descriptor.h"
 
 #if defined(HAVE_POSIX_ACLS)
 #include "modules/vfs_posixacl.h"
@@ -758,7 +798,7 @@ enum flush_reason_enum {
 #endif
 
 #ifndef SIGRTMIN
-#define SIGRTMIN 32
+#define SIGRTMIN NSIG
 #endif
 
 #ifndef MAP_FILE
@@ -900,9 +940,10 @@ krb5_error_code smb_krb5_parse_name(krb5_context context,
                                const char *name, /* in unix charset */
                                 krb5_principal *principal);
 
-krb5_error_code smb_krb5_unparse_name(krb5_context context,
-                               krb5_const_principal principal,
-                               char **unix_name);
+krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
+                                     krb5_context context,
+                                     krb5_const_principal principal,
+                                     char **unix_name);
 
 #ifndef HAVE_KRB5_SET_REAL_TIME
 krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);