summaryrefslogtreecommitdiff
path: root/lib/replace
diff options
context:
space:
mode:
authorBrad Hards <bradh@frogmouth.net>2009-04-22 10:32:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-04-22 10:36:47 +0200
commit703d5897701c22250a2d6e8ffba9ecf01db58f1f (patch)
tree5abc9e748291ae72855c9d0d50f6df593fcd959b /lib/replace
parent7a9be21916589f2c2956e8b264648b66d074bfcb (diff)
downloadsamba-703d5897701c22250a2d6e8ffba9ecf01db58f1f.tar.gz
samba-703d5897701c22250a2d6e8ffba9ecf01db58f1f.tar.bz2
samba-703d5897701c22250a2d6e8ffba9ecf01db58f1f.zip
Avoid using deprecated form of AC_CHECK_TYPE.
libreplace makes use of an older form of AC_CHECK_TYPE which basically provides a fallback definition for the type if it isn't available. http://www.gnu.org/software/hello/manual/autoconf/Obsolete-Macros.html#Obsolete-Macros shows why this isn't a good idea (its not so important, except for pointer types). This patch partly addresses the issue. Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/libreplace_cc.m44
-rw-r--r--lib/replace/replace.h12
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
index 30c63f2f05..a26dee498e 100644
--- a/lib/replace/libreplace_cc.m4
+++ b/lib/replace/libreplace_cc.m4
@@ -141,9 +141,7 @@ AC_CHECK_SIZEOF(off_t)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_SIZEOF(ssize_t)
-AC_CHECK_TYPE(intptr_t, long long)
-AC_CHECK_TYPE(uintptr_t, unsigned long long)
-AC_CHECK_TYPE(ptrdiff_t, unsigned long long)
+AC_CHECK_TYPES([intptr_t, uintptr_t, ptrdiff_t])
if test x"$ac_cv_type_long_long" != x"yes";then
AC_MSG_ERROR([LIBREPLACE needs type 'long long'])
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c5b8676acf..fe1f732acb 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -535,6 +535,18 @@ typedef int bool;
#endif
#endif
+#if !defined(HAVE_INTPTR_T)
+typedef long long intptr_t ;
+#endif
+
+#if !defined(HAVE_UINTPTR_T)
+typedef unsigned long long uintptr_t ;
+#endif
+
+#if !defined(HAVE_PTRDIFF_T)
+typedef unsigned long long ptrdiff_t ;
+#endif
+
/*
* to prevent <rpcsvc/yp_prot.h> from doing a redefine of 'bool'
*