Samba3: Include util.h header file rather than having custom prototypes.

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

diff --git a/source4/include/includes.h b/source4/include/includes.h
index b613a18633eb6b1f7fd0e731eabf50d12a2e28bf..f925e836c56bcb8a78a351e265ba8fa01ea976d2 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,123 +17,38 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef NO_CONFIG_H /* for some tests */
-#include "config.h"
-#endif
+#include "../replace/replace.h"
 
-#include "local.h"
-
-#ifdef __GNUC__
-/** gcc attribute used on function parameters so that it does not emit
- * warnings about them being unused. **/
-#  define UNUSED(param) param __attribute__ ((unused))
-#else
-#  define UNUSED(param) param
-/** Feel free to add definitions for other compilers here. */
-#endif
-
-#ifndef _PUBLIC_
-#ifdef HAVE_VISIBILITY_ATTR
-#  define _PUBLIC_ __attribute__((visibility("default")))
-#else
-#  define _PUBLIC_
-#endif
+/* make sure we have included the correct config.h */
+#ifndef NO_CONFIG_H /* for some tests */
+#ifndef CONFIG_H_IS_FROM_SAMBA
+#error "make sure you have removed all config.h files from standalone builds!"
+#error "the included config.h isn't from samba!"
 #endif
+#endif /* NO_CONFIG_H */
 
-#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 "system/time.h"
+#include "system/wait.h"
 
-#include <sys/types.h>
-#include <stdio.h>
+/* Lists, trees, caching, database... */
 #include <stdlib.h>
-#include <stddef.h>
-#include <sys/time.h>
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#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,
-       PROTOCOL_SMB2
-};
-
-/* 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
-};
-
+#include <stdbool.h>
+#include <talloc.h>
+#ifndef _PRINTF_ATTRIBUTE
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
-#include "lib/replace/replace.h"
-
-/* Lists, trees, caching, database... */
-#include "libcli/util/nt_status.h"
-#include "talloc/talloc.h"
-#include "core.h"
-#include "charset/charset.h"
-#include "structs.h"
-#include "util/util.h"
-#include "param/param.h"
-#include "libcli/util/nterr.h"
-#include "libcli/util/doserr.h"
-#include "librpc/ndr/libndr.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 "auth/credentials/credentials.h"
-#include "libcli/nbt/libnbt.h"
-#include "libcli/util/proto.h"
-
-/* FIXME: This header should be included by pidl where necessary */
-#include "librpc/ndr/ndr_compression.h"
+#endif
+#include "../lib/util/xfile.h"
+#include "../lib/util/attr.h"
+#include "../lib/util/debug.h"
+#include "../lib/util/util.h"
 
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
+#include "libcli/util/error.h"
 
 /* String routines */
-
-#include "util/safe_string.h"
+#include "../lib/util/safe_string.h"
 
 #if 0
 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */