[Scummvm-cvs-logs] SF.net SVN: scummvm:[33294] residual/trunk/engine/lua/lrestore.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sat Jul 26 00:31:12 CEST 2008
Revision: 33294
http://scummvm.svn.sourceforge.net/scummvm/?rev=33294&view=rev
Author: drmccoy
Date: 2008-07-25 22:31:11 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
Fixing compilation
Modified Paths:
--------------
residual/trunk/engine/lua/lrestore.cpp
Modified: residual/trunk/engine/lua/lrestore.cpp
===================================================================
--- residual/trunk/engine/lua/lrestore.cpp 2008-07-25 22:21:04 UTC (rev 33293)
+++ residual/trunk/engine/lua/lrestore.cpp 2008-07-25 22:31:11 UTC (rev 33294)
@@ -118,14 +118,15 @@
static int32 sortCallback(const void *id1, const void *id2) {
#ifdef TARGET_64BITS
- uint64 p1 = ((ArrayIDObj *)id1)->idObj.low | (uint64)(((ArrayIDObj *)id1)->idObj.hi << 32)
- uint64 p2 = ((ArrayIDObj *)id1)->idObj.low | (uint64)(((ArrayIDObj *)id1)->idObj.hi << 32)
+ uint64 p1 = ((ArrayIDObj *)id1)->idObj.low | ((uint64)(((ArrayIDObj *)id1)->idObj.hi)) << 32;
+ uint64 p2 = ((ArrayIDObj *)id2)->idObj.low | ((uint64)(((ArrayIDObj *)id2)->idObj.hi)) << 32;
if (p1 > p2) {
return 1;
} else if (p1 < p2) {
return -1;
} else {
return 0;
+ }
#else
if (((ArrayIDObj *)id1)->idObj.low > ((ArrayIDObj *)id2)->idObj.low) {
return 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list