[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src checksum.hpp checksum.cpp
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src checksum.hpp checksum.cpp |
Date: |
Fri, 12 Aug 2005 06:32:12 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/12 10:32:12
Modified files:
src : checksum.hpp checksum.cpp
Log message:
Make checksums work on AMD64
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/checksum.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/checksum.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: wesnoth/src/checksum.cpp
diff -u wesnoth/src/checksum.cpp:1.4 wesnoth/src/checksum.cpp:1.5
--- wesnoth/src/checksum.cpp:1.4 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/checksum.cpp Fri Aug 12 10:32:12 2005
@@ -1,4 +1,4 @@
-/* $Id: checksum.cpp,v 1.4 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: checksum.cpp,v 1.5 2005/08/12 10:32:12 j_daniel Exp $ */
/*
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -18,7 +18,7 @@
setp((char*)buffer, (char*)buffer+BUFFERSIZE);
}
-unsigned long checksumstreambuf::checksum()
+unsigned int checksumstreambuf::checksum()
{
sum((unsigned char*)pbase(), (unsigned char*)pptr());
@@ -51,8 +51,8 @@
x = (unsigned short)(*p) + ((unsigned short)(*(p+1)) <<
8);
}
- sa = 0xffff & ((unsigned long)(sa) + (unsigned long)(sb));
- sb = 0xffff & ((unsigned long)(x) + (unsigned long)(sb));
+ sa = 0xffff & ((unsigned int)(sa) + (unsigned int)(sb));
+ sb = 0xffff & ((unsigned int)(x) + (unsigned int)(sb));
}
}
@@ -61,7 +61,7 @@
{
}
-unsigned long checksumstream::checksum()
+unsigned int checksumstream::checksum()
{
return sbuf.checksum();
}
Index: wesnoth/src/checksum.hpp
diff -u wesnoth/src/checksum.hpp:1.3 wesnoth/src/checksum.hpp:1.4
--- wesnoth/src/checksum.hpp:1.3 Sat Jun 4 19:16:05 2005
+++ wesnoth/src/checksum.hpp Fri Aug 12 10:32:12 2005
@@ -1,4 +1,4 @@
-/* $Id: checksum.hpp,v 1.3 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: checksum.hpp,v 1.4 2005/08/12 10:32:12 j_daniel Exp $ */
/*
Copyright (C) 2005 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -21,7 +21,7 @@
{
public:
checksumstreambuf();
- unsigned long checksum();
+ unsigned int checksum();
protected:
virtual int overflow(int c);
@@ -43,7 +43,7 @@
{
public:
checksumstream();
- unsigned long checksum();
+ unsigned int checksum();
private:
checksumstreambuf& sbuf;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src checksum.hpp checksum.cpp,
Jon Daniel <=