[Wesnoth-cvs-commits] wesnoth/src checksum.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/25 18:06:41

Modified files:
        src            : checksum.cpp 

Log message:
        Fix the checksum not working the same way in 64-bit platforms than it 
does in
        32-bit platforms. Should be portable now.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/checksum.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/checksum.cpp
diff -u wesnoth/src/checksum.cpp:1.1 wesnoth/src/checksum.cpp:1.2
--- wesnoth/src/checksum.cpp:1.1        Sat Apr 23 12:13:10 2005
+++ wesnoth/src/checksum.cpp    Mon Apr 25 18:06:41 2005
@@ -1,4 +1,4 @@
-/* $Id: checksum.cpp,v 1.1 2005/04/23 12:13:10 gruikya Exp $ */
+/* $Id: checksum.cpp,v 1.2 2005/04/25 18:06:41 gruikya Exp $ */
 /*
    Copyright (C) 2005 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -51,8 +51,8 @@
                        x = (unsigned short)(*p) + ((unsigned short)(*(p+1)) << 
8);
                }
 
-               sa += sb;
-               sb += x;
+               sa = 0xffff & ((unsigned long)(sa) + (unsigned long)(sb));
+               sb = 0xffff & ((unsigned long)(x) + (unsigned long)(sb));
        }
 }