[Scummvm-git-logs] scummvm master -> 987c0eb76a26f325b1f079afb3701470d8a8942f

[bluegr]

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

Summary:
987c0eb76a COMMON: Add a signed version of uintptr


Commit: 987c0eb76a26f325b1f079afb3701470d8a8942f
    https://github.com/scummvm/scummvm/commit/987c0eb76a26f325b1f079afb3701470d8a8942f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-19T11:21:41+03:00

Commit Message:
COMMON: Add a signed version of uintptr

Changed paths:
    common/scummsys.h
    configure


diff --git a/common/scummsys.h b/common/scummsys.h
index 0dcb43c3d4..655daa1a88 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -469,10 +469,12 @@
 		  defined(__LP64__) || \
 		  defined(_M_ARM64)
 
+typedef int64 intptr;
 typedef uint64 uintptr;
 
 #else
 
+typedef int32 intptr;
 typedef uint32 uintptr;
 
 #endif
diff --git a/configure b/configure
index e5b03c5ac5..83620ad252 100755
--- a/configure
+++ b/configure
@@ -2467,10 +2467,12 @@ EOF
 echo_n "Checking 64-bitness... "
 pointer_is_32bit
 if test $? -eq 0; then
-	type_ptr=uint32
+	signed_type_ptr=int32
+	unsigned_type_ptr=uint32
 	echo "no"
 else
-	type_ptr=uint64
+	signed_type_ptr=int64
+	unsigned_type_ptr=uint64
 	echo "yes"
 fi
 
@@ -6189,7 +6191,8 @@ typedef signed $type_4_byte int32;
 typedef signed $type_8_byte int64;
 #endif
 
-typedef $type_ptr  uintptr;
+typedef $signed_type_ptr intptr;
+typedef $unsigned_type_ptr uintptr;
 
 #if defined(__APPLE__) && !defined(__ppc__)
 #ifndef _UINT64