diff options
Diffstat (limited to 'source4/lib/ldb/include')
| -rw-r--r-- | source4/lib/ldb/include/dlinklist.h | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/source4/lib/ldb/include/dlinklist.h b/source4/lib/ldb/include/dlinklist.h index 176c138aaf..3779a4cc61 100644 --- a/source4/lib/ldb/include/dlinklist.h +++ b/source4/lib/ldb/include/dlinklist.h @@ -37,6 +37,7 @@ do { \ } while (0) /* remove an element from a list - element doesn't have to be in list. */ +#ifndef DLIST_REMOVE #define DLIST_REMOVE(list, p) \ do { \ if ((p) == (list)) { \ @@ -48,6 +49,7 @@ do { \ } \ if ((p) && ((p) != (list))) (p)->next = (p)->prev = NULL; \ } while (0) +#endif /* promote an element to the top of the list */ #define DLIST_PROMOTE(list, p) \ diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h index 800ffdf568..ce0d40e101 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/includes.h @@ -4,11 +4,20 @@ a temporary includes file until I work on the ldb build system */ -#ifdef _SAMBA_BUILD_ +#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)) |