diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/lib/talloc/config.m4 | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h index 8b513e20c7..4372d6b3f9 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/includes.h @@ -26,9 +26,5 @@ #include "ldb_private.h" #include "talloc.h" -#if defined(__intptr_t_defined) || defined(HAVE_INTPTR_T) #define discard_const(ptr) ((void *)((intptr_t)(ptr))) -#else -#define discard_const(ptr) ((void *)(ptr)) -#endif #define discard_const_p(type, ptr) ((type *)discard_const(ptr)) diff --git a/source4/lib/talloc/config.m4 b/source4/lib/talloc/config.m4 index 70fedade4a..824eb6d1ff 100644 --- a/source4/lib/talloc/config.m4 +++ b/source4/lib/talloc/config.m4 @@ -6,5 +6,5 @@ if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available]) fi -AC_CHECK_TYPES(intptr_t) +AC_CHECK_TYPE(intptr_t, unsigned long long) AC_CHECK_HEADERS(stdint.h stdarg.h unistd.h sys/types.h) |