r13809: move ldb specific define

[jra/samba/.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 7b6b2014e66c3f77d005fd615b339d01cb4d1509..dc71696ac7567e22a472bec2edd4f618603db298 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -23,7 +23,6 @@
 
 #ifndef NO_CONFIG_H /* for some tests */
 #include "config.h"
-#include "smb_build.h"
 #endif
 
 #include "local.h"
@@ -37,6 +36,18 @@
 /** Feel free to add definitions for other compilers here. */
 #endif
 
+#ifndef PRINTF_ATTRIBUTE
+#if !defined(NO_PRINTF_ATTRIBUTE) && (__GNUC__ >= 3)
+/** Use gcc attribute to check printf fns.  a1 is the 1-based index of
+ * the parameter containing the format, and a2 the index of the first
+ * argument. Note that some gcc 2.x versions don't handle this
+ * properly **/
+#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2)))
+#else
+#define PRINTF_ATTRIBUTE(a1, a2)
+#endif
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,40 +75,6 @@
 #include <varargs.h>
 #endif
 
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#include "lib/replace/win32/replace.h"
-#endif
-
-/* we support ADS if we want it and have krb5 and ldap libs */
-#if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
-#define HAVE_ADS
-#endif
-
-/* tell ldb we have the internal ldap code */
-#define HAVE_ILDAP 1
-
-/*
- * Define VOLATILE if needed.
- */
-
-#define False (0)
-#define True (1)
-#define Auto (2)
-
-typedef int BOOL;
-
 /*
   we use struct ipv4_addr to avoid having to include all the
   system networking headers everywhere
@@ -106,63 +83,44 @@ struct ipv4_addr {
        uint32_t addr;
 };
 
-#ifndef HAVE_STRERROR
-extern char *sys_errlist[];
-#define strerror(i) sys_errlist[i]
-#endif
+/* protocol types. It assumes that higher protocols include lower protocols
+   as subsets. FIXME: Move to one of the smb-specific headers */
+enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1};
 
-#ifndef HAVE_ERRNO_DECL
-extern int errno;
-#endif
+/* passed to br lock code. FIXME: Move to one of the smb-specific headers */
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
 
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "lib/replace/replace.h"
 
 /* Lists, trees, caching, database... */
-#include "xfile.h"
-#include "lib/talloc/talloc.h"
 #include "nt_status.h"
+#include "talloc/talloc.h"
+#include "core.h"
+#include "charset/charset.h"
 #include "structs.h"
-#include "trans2.h"
-#include "nterr.h"
-#include "charset.h"
-#include "debug.h"
-#include "doserr.h"
-#include "enums.h"
-#include "smb_macros.h"
-#include "smb.h"
-#include "byteorder.h"
-#include "module.h"
+#include "util/util.h"
+#include "libcli/util/nterr.h"
+#include "libcli/util/doserr.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "smb_interfaces.h"
-#include "ntvfs/ntvfs.h"
-#include "cli_context.h"
-#include "lib/com/com.h"
-#include "credentials.h"
-
+#include "libcli/raw/trans2.h"
+#include "libcli/raw/interfaces.h"
+#include "auth/credentials/credentials.h"
+#include "libcli/nbt/libnbt.h"
 
-
-#define malloc_p(type) (type *)malloc(sizeof(type))
-#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
-#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
 
 /***** automatically generated prototypes *****/
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "include/proto.h"
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
 
 /* String routines */
 
-#include "safe_string.h"
-
-#ifndef HAVE_PIPE
-#define SYNC_DNS 1
-#endif
+#include "util/safe_string.h"
 
 extern int DEBUGLEVEL;
 
@@ -193,25 +151,11 @@ extern int DEBUGLEVEL;
   Also, please call this via the discard_const_p() macro interface, as that
   makes the return type safe.
 */
-#ifdef HAVE_INTPTR_T
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
-#else
-#define discard_const(ptr) ((void *)(ptr))
-#endif
 #define discard_const_p(type, ptr) ((type *)discard_const(ptr))
 
-#ifndef HAVE_SSIZE_T
-#define ssize_t int
-#endif
-
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
+#ifndef _PUBLIC_
+#define _PUBLIC_
 #endif
 
-/*
-  type safe varient of smb_xmalloc()
-*/
-#define smb_xmalloc_p(type) (type *)smb_xmalloc(sizeof(type))
-
 #endif /* _INCLUDES_H */
-