summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-10 16:14:30 +0200
committerVolker Lendecke <vl@samba.org>2008-06-10 17:21:31 +0200
commitdc45718f32f46bc4c30c25eee24c39fddc8cdbc3 (patch)
treef1dbea31cfd7bbb5a1fdb43b7325b4962b223bd1 /source3
parentf3ddf2b23f352014530513765ec35df647ca2056 (diff)
downloadsamba-dc45718f32f46bc4c30c25eee24c39fddc8cdbc3.tar.gz
samba-dc45718f32f46bc4c30c25eee24c39fddc8cdbc3.tar.bz2
samba-dc45718f32f46bc4c30c25eee24c39fddc8cdbc3.zip
Correctly find a [u]int32_t replacement
(cherry picked from commit 346375cda557a675f8f882ca2ae8edffec725a72) (This used to be commit 15a53945c9563b4517bd8b69a9bb0554eef5edff)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/replace/libreplace_cc.m421
1 files changed, 15 insertions, 6 deletions
diff --git a/source3/lib/replace/libreplace_cc.m4 b/source3/lib/replace/libreplace_cc.m4
index 0ce0958a96..bed05582d8 100644
--- a/source3/lib/replace/libreplace_cc.m4
+++ b/source3/lib/replace/libreplace_cc.m4
@@ -109,25 +109,34 @@ AC_CHECK_HEADERS([standards.h])
# Solaris needs HAVE_LONG_LONG defined
AC_CHECK_TYPES(long long)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+
AC_CHECK_TYPE(uint_t, unsigned int)
AC_CHECK_TYPE(int8_t, char)
AC_CHECK_TYPE(uint8_t, unsigned char)
AC_CHECK_TYPE(int16_t, short)
AC_CHECK_TYPE(uint16_t, unsigned short)
+
+if test $ac_cv_sizeof_int -eq 4 ; then
+AC_CHECK_TYPE(int32_t, int)
+AC_CHECK_TYPE(uint32_t, unsigned int)
+elif test $ac_cv_size_long -eq 4 ; then
AC_CHECK_TYPE(int32_t, long)
AC_CHECK_TYPE(uint32_t, unsigned long)
+else
+AC_MSG_ERROR([LIBREPLACE no 32-bit type found])
+fi
+
AC_CHECK_TYPE(int64_t, long long)
AC_CHECK_TYPE(uint64_t, unsigned long long)
AC_CHECK_TYPE(size_t, unsigned int)
AC_CHECK_TYPE(ssize_t, int)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-
AC_CHECK_SIZEOF(off_t)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_SIZEOF(ssize_t)