From c5b5f8844ced4e143c0090009ad72aa9b40fb7bc Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 25 Jan 2012 20:13:43 +0000
Subject: CONFIGURE: Fix compilation on 32 bits MacOS X

The issue was that it cannot find a 64 bits type because 'long int' is
32 bits and compilation of the test program with 'long long' failed
due to the use of -pedantic flag (and 'long long' is not part of
ISO C++ 1998 standard). It nevertheless defined _UINT64
which subsequently told systems headers to not redefine uint64 and
caused many compilation error in system headers.
---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure b/configure
index 423e55fa9b..ab8259d067 100755
--- a/configure
+++ b/configure
@@ -3893,6 +3893,10 @@ typedef unsigned $type_4_byte uint32;
 typedef signed $type_1_byte int8;
 typedef signed $type_2_byte int16;
 typedef signed $type_4_byte int32;
+EOF
+
+if test -n "$_def_64bit_type_unsigned"  ; then
+cat >> config.h << EOF
 
 /* 64-bit stuff */
 $_def_64bit_type_signed
@@ -3904,6 +3908,10 @@ $_def_64bit_type_unsigned
 #else
 $_def_64bit_type_unsigned
 #endif
+EOF
+fi
+
+cat >> config.h << EOF
 
 #endif /* CONFIG_H */
 EOF
-- 
cgit v1.2.3