aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThierry Crozat2012-01-25 20:13:43 +0000
committerThierry Crozat2012-01-27 22:09:53 +0000
commitc5b5f8844ced4e143c0090009ad72aa9b40fb7bc (patch)
treec62983ce38f9f3369dfcbd3280b24cf632c2429d /configure
parentab2b020ff10b2e5d25cc93757029838c7eac6b41 (diff)
downloadscummvm-rg350-c5b5f8844ced4e143c0090009ad72aa9b40fb7bc.tar.gz
scummvm-rg350-c5b5f8844ced4e143c0090009ad72aa9b40fb7bc.tar.bz2
scummvm-rg350-c5b5f8844ced4e143c0090009ad72aa9b40fb7bc.zip
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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
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