r1432: - Move the various Gtk-specific parts from the registry code into a directory...

[samba.git] / source / include / includes.h

diff --git a/source/include/includes.h b/source/include/includes.h
index 441111ed6f61974add1001fdb93899863c168258..8b60881cecfc3710da0c2b3327be934eafb16d0d 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -432,16 +432,6 @@ typedef int socklen_t;
 #endif
 
 
-#ifndef uchar
-#define uchar unsigned char
-#endif
-
-#ifdef HAVE_UNSIGNED_CHAR
-#define schar signed char
-#else
-#define schar char
-#endif
-
 /*
    Samba needs type definitions for 
    int8_t,  int16_t,  int32_t, int64_t 
@@ -648,6 +638,7 @@ extern int errno;
 #include "dynconfig.h"
 
 #include "version.h"
+#include "rewrite.h"
 #include "smb.h"
 #include "ads.h"
 #include "nameserv.h"
@@ -661,6 +652,9 @@ extern int errno;
 #include "libcli/auth/ntlmssp.h"
 #include "libcli/auth/credentials.h"
 #include "libcli/auth/schannel.h"
+#include "libcli/auth/kerberos.h"
+#include "libcli/auth/gensec.h"
+#include "libcli/auth/spnego.h"
 
 #include "auth/auth.h"
 
@@ -675,10 +669,11 @@ extern int errno;
 #include "librpc/rpc/dcerpc.h"
 
 #include "rpc_server/dcerpc_server.h"
-#include "context.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
 #include "registry.h"
+#include "gtk/common/gtk-smb.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
@@ -689,7 +684,10 @@ typedef int (*comparison_fn_t)(const void *, const void *);
 #endif
 
 /***** automatically generated prototypes *****/
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #include "proto.h"
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
 
 /* String routines */
 
@@ -711,10 +709,6 @@ typedef int (*comparison_fn_t)(const void *, const void *);
 #define MAP_FILE 0
 #endif
 
-#if (!defined(WITH_LDAP) && !defined(WITH_TDB_SAM))
-#define USE_SMBPASS_DB 1
-#endif
-
 #if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
 #define OSF1_ENH_SEC 1
 #endif