[Scummvm-git-logs] scummvm master -> d34314ccc9d767907589babc561c60abbb078e29

[peterkohaut]

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:
d34314ccc9 BUILD: Fixed macro redefinition warning for 64 bits builds


Commit: d34314ccc9d767907589babc561c60abbb078e29
    https://github.com/scummvm/scummvm/commit/d34314ccc9d767907589babc561c60abbb078e29
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-09T23:48:57+01:00

Commit Message:
BUILD: Fixed macro redefinition warning for 64 bits builds

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index 938770b..432dd74 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -321,7 +321,9 @@
 		  defined(__powerpc64__) || \
 		  defined(__LP64__)
 
-		#define SCUMM_64BITS
+		#if !defined(SCUMM_64BITS)
+			#define SCUMM_64BITS
+		#endif
 
 	#endif