[Scummvm-cvs-logs] scummvm master -> c74fde632fa3ecd2d4fb238878191da270b96e1e

lordhoto lordhoto at gmail.com
Tue Jan 10 16:16:08 CET 2012


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3606ebed6a CONFIGURE: Fix formatting.
a3e06d5074 CONFIGURE: Make 32bit pointer check a bit safer.
c74fde632f CONFIGURE: Also check "long long" in find_type_with_size.


Commit: 3606ebed6abbfc79f0cc5373aae80bd78667f876
    https://github.com/scummvm/scummvm/commit/3606ebed6abbfc79f0cc5373aae80bd78667f876
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-10T07:13:20-08:00

Commit Message:
CONFIGURE: Fix formatting.

Thanks to Max for pointing out.

Changed paths:
    configure



diff --git a/configure b/configure
index c10e10a..4f0cf95 100755
--- a/configure
+++ b/configure
@@ -1709,27 +1709,27 @@ EOF
 # Check whether the system is 32-bit
 #
 pointer_is_32bit() {
-        cat > tmp_pointer_is_32bit.cpp << EOF
+	cat > tmp_pointer_is_32bit.cpp << EOF
 int main() {
-        static int test_array[1 - 2 * !(sizeof(void *) == 4)];
+	static int test_array[1 - 2 * !(sizeof(void *) == 4)];
 }
 EOF
-        $CXX $CXXFLAGS -c -o $TMPO.o tmp_pointer_is_32bit.cpp 2>/dev/null
-        status=$?
-        cc_check_clean tmp_pointer_is_32bit.cpp
-        return $status
+	$CXX $CXXFLAGS -c -o $TMPO.o tmp_pointer_is_32bit.cpp 2>/dev/null
+	status=$?
+	cc_check_clean tmp_pointer_is_32bit.cpp
+	return $status
 }
 
 echo_n "Checking 64-bitness... "
 pointer_is_32bit
 if test $? -eq 0; then
-        type_ptr=int32
-        echo "no"
-        add_line_to_config_h "/* #define SCUMM_64BITS */"
+	type_ptr=int32
+	echo "no"
+	add_line_to_config_h "/* #define SCUMM_64BITS */"
 else
-        type_ptr=int64
-        echo "yes"
-        add_line_to_config_h "#define SCUMM_64BITS"
+	type_ptr=int64
+	echo "yes"
+	add_line_to_config_h "#define SCUMM_64BITS"
 fi
 
 #
@@ -1758,8 +1758,8 @@ type_8_byte=`find_type_with_size 8`
 TMPR="$?"
 echo "$type_8_byte"
 if test $TMPR -eq 0; then
-        _def_64bit_type_signed="typedef signed $type_8_byte int64;"
-        _def_64bit_type_unsigned="typedef unsigned $type_8_byte uint64;"
+	_def_64bit_type_signed="typedef signed $type_8_byte int64;"
+	_def_64bit_type_unsigned="typedef unsigned $type_8_byte uint64;"
 fi
 # force cleanup after check for 8 bytes type
 cc_check_clean tmp_find_type_with_size.cpp


Commit: a3e06d507449f1b736c19cbd46662383f59e75df
    https://github.com/scummvm/scummvm/commit/a3e06d507449f1b736c19cbd46662383f59e75df
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-10T07:13:29-08:00

Commit Message:
CONFIGURE: Make 32bit pointer check a bit safer.

This adapts the check to be similar to the find_type_with_size check, i.e. it
assigns a value to test_array and also returns 0. Should not be required, at
least builtbot went fine, but better be safe and sorry.

Changed paths:
    configure



diff --git a/configure b/configure
index 4f0cf95..5194680 100755
--- a/configure
+++ b/configure
@@ -1712,6 +1712,8 @@ pointer_is_32bit() {
 	cat > tmp_pointer_is_32bit.cpp << EOF
 int main() {
 	static int test_array[1 - 2 * !(sizeof(void *) == 4)];
+	test_array[0] = 0;
+	return 0;
 }
 EOF
 	$CXX $CXXFLAGS -c -o $TMPO.o tmp_pointer_is_32bit.cpp 2>/dev/null


Commit: c74fde632fa3ecd2d4fb238878191da270b96e1e
    https://github.com/scummvm/scummvm/commit/c74fde632fa3ecd2d4fb238878191da270b96e1e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-10T07:13:29-08:00

Commit Message:
CONFIGURE: Also check "long long" in find_type_with_size.

This is because on Win64 "long" is 4 bytes and only "long long" is 8 bytes.
Without this check we would not have a 64 bit integer type on Win64.

Changed paths:
    configure



diff --git a/configure b/configure
index 5194680..5b0e857 100755
--- a/configure
+++ b/configure
@@ -1682,7 +1682,7 @@ esac
 # Determine a data type with the given length
 #
 find_type_with_size() {
-	for datatype in int short char long unknown; do
+	for datatype in int short char long "long long" unknown; do
 		cat > tmp_find_type_with_size.cpp << EOF
 typedef $datatype ac__type_sizeof_;
 int main() {






More information about the Scummvm-git-logs mailing list