diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-09-27 03:11:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:01 -0500 |
| commit | 675f81eed3086682faeca34e56d441c6e38bd800 (patch) | |
| tree | 058269516d973ccc8fbfdd85183c3590c7df496f | |
| parent | f895df9772a49bc1e3ff0d2078f2e9d3dc2b7f4a (diff) | |
| download | samba-675f81eed3086682faeca34e56d441c6e38bd800.tar.gz samba-675f81eed3086682faeca34e56d441c6e38bd800.tar.bz2 samba-675f81eed3086682faeca34e56d441c6e38bd800.zip | |
r10525: change from AC_CHECK_TYPES() to AC_CHECK_TYPE() for intptr_t, so the
type is always available, which means we need less #ifdefs
(This used to be commit d4af4b11ae69a63fa3b2048e6d576055d86d2bb4)
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 1 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/lib/talloc/config.m4 | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index 846a9e2ceb..57ccd9f6ed 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -79,7 +79,6 @@ AC_DIRENT_D_OFF AC_CHECK_TYPE(ino_t,unsigned) AC_CHECK_TYPE(loff_t,off_t) AC_CHECK_TYPE(offset_t,loff_t) -AC_CHECK_TYPES(intptr_t) AC_CHECK_TYPES(long long) diff --git a/source4/include/includes.h b/source4/include/includes.h index 41452578ee..78481ac679 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -162,11 +162,7 @@ extern int DEBUGLEVEL; Also, please call this via the discard_const_p() macro interface, as that makes the return type safe. */ -#ifdef 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)) #ifndef UINT16_MAX 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) |