From 3e2c696e45b24b0192ab7b1ddaf1dd4d79571609 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 24 Sep 2006 02:49:04 +0000 Subject: r18866: Jeremy and Volker have given the go-ahead on the group mapping ldb code. Yay! This first commit copies lib/ldb/ from Samba4. A huge congratulations should go to Simo on this - he has put an enormous amount of work into ldb, and it's great to see it go into the Samba3 tree. (This used to be commit bbedf2e34315f5c420a3a05dfe22b1d5cf79f042) --- source3/lib/ldb/include/includes.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 source3/lib/ldb/include/includes.h (limited to 'source3/lib/ldb/include/includes.h') diff --git a/source3/lib/ldb/include/includes.h b/source3/lib/ldb/include/includes.h new file mode 100644 index 0000000000..ce0d40e101 --- /dev/null +++ b/source3/lib/ldb/include/includes.h @@ -0,0 +1,34 @@ +#ifndef _LDB_PRIVATE_INCLUDES_H_ +#define _LDB_PRIVATE_INCLUDES_H_ +/* + a temporary includes file until I work on the ldb build system +*/ + +#if (_SAMBA_BUILD_ >= 4) +/* tell ldb we have the internal ldap code */ +#define HAVE_ILDAP 1 +#endif + +#if (_SAMBA_BUILD_ <= 3) +/* allow forbidden string functions - should be replaced with _m functions */ +#undef strcasecmp +#undef strncasecmp +#define dyn_MODULESDIR dyn_LIBDIR +#endif + + + +#define discard_const(ptr) ((void *)((intptr_t)(ptr))) +#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) + +#include "replace.h" +#include "system/filesys.h" +#include "system/network.h" +#include "system/time.h" +#include "talloc.h" +#include "ldb.h" +#include "ldb_errors.h" +#include "ldb_private.h" +#include "dlinklist.h" + +#endif /*_LDB_PRIVATE_INCLUDES_H_*/ -- cgit From 762b86ff0deb072871081f2684f63778e36ad3ce Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 28 Nov 2006 17:47:41 +0000 Subject: r19935: always use discard_const_p() in lib/ldb/ metze (This used to be commit 4a5da57306ad8cce5522ee72349cb85b447e295c) --- source3/lib/ldb/include/includes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/lib/ldb/include/includes.h') diff --git a/source3/lib/ldb/include/includes.h b/source3/lib/ldb/include/includes.h index ce0d40e101..7a2e112241 100644 --- a/source3/lib/ldb/include/includes.h +++ b/source3/lib/ldb/include/includes.h @@ -18,8 +18,7 @@ -#define discard_const(ptr) ((void *)((intptr_t)(ptr))) -#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) +#define discard_const_p(type, ptr) ((type *)((intptr_t)(ptr))) #include "replace.h" #include "system/filesys.h" -- cgit From 8b3ea388bce4faf65a3a1722a456f82686863071 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 15 Apr 2007 21:14:37 +0000 Subject: r22229: discard_const_p is in lib/replace now metze (This used to be commit 8dea4ebe98ec5bdb7fd55b54e9b14a52db817f4f) --- source3/lib/ldb/include/includes.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/lib/ldb/include/includes.h') diff --git a/source3/lib/ldb/include/includes.h b/source3/lib/ldb/include/includes.h index 7a2e112241..e2bcca2b04 100644 --- a/source3/lib/ldb/include/includes.h +++ b/source3/lib/ldb/include/includes.h @@ -16,10 +16,6 @@ #define dyn_MODULESDIR dyn_LIBDIR #endif - - -#define discard_const_p(type, ptr) ((type *)((intptr_t)(ptr))) - #include "replace.h" #include "system/filesys.h" #include "system/network.h" -- cgit