#include "local.h"
-#if (__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
-
#ifdef __GNUC__
/** gcc attribute used on function parameters so that it does not emit
* warnings about them being unused. **/
#include <varargs.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
-
-/*
- * Define VOLATILE if needed.
- */
-
-#if defined(HAVE_VOLATILE)
-#define VOLATILE volatile
-#else
-#define VOLATILE
-#endif
-
-/*
- Samba needs type definitions for
- int8_t, int16_t, int32_t, int64_t
- uint8_t, uint16_t, uint32_t and uint64_t.
-
- Normally these are signed and unsigned 8, 16, 32 and 64 bit integers, but
- they actually only need to be at least 8, 16, 32 and 64 bits
- respectively. Thus if your word size is 8 bytes just defining them
- as signed and unsigned int will work.
-*/
-
-#if !defined(int8)
-#define int8 int8_t
-#endif
-
-#if !defined(uint8)
-#define uint8 uint8_t
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
#endif
-#if !defined(int16)
-#define int16 int16_t
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
#endif
-#if !defined(uint16)
-#define uint16 uint16_t
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
#endif
-#if !defined(int32)
-#define int32 int32_t
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include "lib/replace/win32/replace.h"
#endif
-#if !defined(uint32)
-#define uint32 uint32_t
+/* 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
-#if !defined(int64)
-#define int64 int64_t
-#endif
+/* tell ldb we have the internal ldap code */
+#define HAVE_ILDAP 1
-#if !defined(uint64)
-#define uint64 uint64_t
-#endif
+/*
+ * Define VOLATILE if needed.
+ */
#define False (0)
#define True (1)
extern int errno;
#endif
+#include "lib/replace/replace.h"
+
/* Lists, trees, caching, database... */
-#include "version.h"
#include "xfile.h"
-#include "talloc.h"
+#include "lib/talloc/talloc.h"
#include "nt_status.h"
#include "structs.h"
-#include "lib/tdb/include/tdb.h"
-#include "lib/tdb/include/spinlock.h"
-#include "lib/tdb/include/tdbutil.h"
-#include "db_wrap.h"
#include "trans2.h"
#include "nterr.h"
#include "charset.h"
#include "debug.h"
#include "doserr.h"
#include "enums.h"
-#include "pstring.h"
#include "smb_macros.h"
#include "smb.h"
-#include "ads.h"
-#include "lib/socket/socket.h"
-#include "libcli/ldap/ldap.h"
-#include "nameserv.h"
#include "byteorder.h"
#include "module.h"
-#include "mutex.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "librpc/ndr/ndr_orpc.h"
+#include "librpc/gen_ndr/ndr_orpc.h"
#include "librpc/rpc/dcerpc.h"
-#include "lib/dcom/common/dcom.h"
-#include "librpc/gen_ndr/ndr_dcom.h"
#include "smb_interfaces.h"
-#include "smbd/server.h"
-#include "smbd/service.h"
#include "ntvfs/ntvfs.h"
#include "cli_context.h"
-#include "nsswitch/winbind_client.h"
+#include "lib/com/com.h"
+#include "credentials.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)
-#ifndef HAVE_COMPARISON_FN_T
-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"
#include "safe_string.h"
-#ifdef __COMPAR_FN_T
-#define QSORT_CAST (__compar_fn_t)
-#endif
-
-#ifndef QSORT_CAST
-#define QSORT_CAST (int (*)(const void *, const void *))
-#endif
-
#ifndef HAVE_PIPE
#define SYNC_DNS 1
#endif
-#ifndef HAVE_STRDUP
-char *strdup(const char *s);
-#endif
-
-#ifndef HAVE_MEMMOVE
-void *memmove(void *dest,const void *src,int size);
-#endif
-
-#ifndef HAVE_MKTIME
-time_t mktime(struct tm *t);
-#endif
-
-#ifndef HAVE_STRLCPY
-size_t strlcpy(char *d, const char *s, size_t bufsize);
-#endif
-
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *d, const char *s, size_t bufsize);
-#endif
-
-#ifndef HAVE_STRNDUP
-char *strndup(const char *s, size_t n);
-#endif
-
-#ifndef HAVE_STRNLEN
-size_t strnlen(const char *s, size_t n);
-#endif
-
-#ifndef HAVE_STRTOUL
-unsigned long strtoul(const char *nptr, char **endptr, int base);
-#endif
-
-#ifndef HAVE_SETENV
-int setenv(const char *name, const char *value, int overwrite);
-#endif
-
-#ifndef HAVE_VASPRINTF_DECL
-int vasprintf(char **ptr, const char *format, va_list ap);
-#endif
-
-#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET)
-#define bzero(a,b) memset((a),'\0',(b))
-#endif
-
extern int DEBUGLEVEL;
-/* add varargs prototypes with printf checking */
-#ifndef HAVE_SNPRINTF_DECL
-int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
-#endif
-#ifndef HAVE_ASPRINTF_DECL
-int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
-#endif
-
-
-/* we used to use these fns, but now we have good replacements
- for snprintf and vsnprintf */
-#define slprintf snprintf
-
-
-/* we need to use __va_copy() on some platforms */
-#ifdef HAVE_VA_COPY
-#define VA_COPY(dest, src) __va_copy(dest, src)
-#else
-#define VA_COPY(dest, src) (dest) = (src)
-#endif
-
#if defined(VALGRIND)
#define strlen(x) valgrind_strlen(x)
#endif
+#if 0
+/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
#define TALLOC_ABORT(reason) smb_panic(reason)
-
+#endif
/*
this is a warning hack. The idea is to use this everywhere that we
#endif
#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
-#endif /* _INCLUDES_H */
+#ifndef HAVE_SSIZE_T
+#define ssize_t int
+#endif
+
+#ifndef UINT16_MAX
+#define UINT16_MAX 65535
+#endif
/*
type safe varient of smb_xmalloc()
*/
#define smb_xmalloc_p(type) (type *)smb_xmalloc(sizeof(type))
+#endif /* _INCLUDES_H */
+