[Scummvm-cvs-logs] scummvm master -> 220e945d6746ce22c655b2893f7ce0c001d811a6

dreammaster dreammaster at scummvm.org
Wed Sep 5 14:34:32 CEST 2012


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:
220e945d67 TONY: Bugfix for OFFSETOF macro on 64-bit systems


Commit: 220e945d6746ce22c655b2893f7ce0c001d811a6
    https://github.com/scummvm/scummvm/commit/220e945d6746ce22c655b2893f7ce0c001d811a6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-09-05T05:32:02-07:00

Commit Message:
TONY: Bugfix for OFFSETOF macro on 64-bit systems

Changed paths:
    engines/tony/mpal/memory.cpp



diff --git a/engines/tony/mpal/memory.cpp b/engines/tony/mpal/memory.cpp
index 428c07b..78b036e 100644
--- a/engines/tony/mpal/memory.cpp
+++ b/engines/tony/mpal/memory.cpp
@@ -64,7 +64,7 @@ void *MemoryManager::alloc(uint32 size, uint flags) {
 	return &item->_data[0];
 }
 
-#define OFFSETOF(type, field)    ((unsigned long) &(((type *) 0)->field))
+#define OFFSETOF(type, field)    ((size_t) &(((type *) 0)->field))
 
 /**
  * Returns a reference to the MemoryItem for a gien byte pointer






More information about the Scummvm-git-logs mailing list