Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 11247803b37c18f5c2f1699a15ca336c > files > 1

stepmania-3.9-12mdv2010.1.src.rpm

--- StepMania-3.9-src/src/crypto51/misc.h.crypto	2004-05-25 12:49:41.000000000 +0200
+++ StepMania-3.9-src/src/crypto51/misc.h	2006-12-02 04:26:24.000000000 +0100
@@ -142,7 +142,7 @@
 
 inline bool IsAlignedOn(const void *p, unsigned int alignment)
 {
-	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned int)p, alignment) == 0 : (unsigned int)p % alignment == 0;
+	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
 }
 
 template <class T>
--- StepMania-3.9-src/src/crypto51/misc.cpp.crypto	2004-05-13 08:02:28.000000000 +0200
+++ StepMania-3.9-src/src/crypto51/misc.cpp	2006-12-02 05:13:29.000000000 +0100
@@ -4,6 +4,8 @@
 #include "misc.h"
 #include "words.h"
 
+#include <stdint.h>
+
 NAMESPACE_BEGIN(CryptoPP)
 
 byte OAEP_P_DEFAULT[1];
@@ -16,7 +18,7 @@
 
 void xorbuf(byte *buf, const byte *mask, unsigned int count)
 {
-	if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0)
+	if (((size_t)buf | (size_t)mask | count) % WORD_SIZE == 0)
 		XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
 	else
 	{
@@ -27,7 +29,7 @@
 
 void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count)
 {
-	if (((unsigned int)output | (unsigned int)input | (unsigned int)mask | count) % WORD_SIZE == 0)
+	if (((size_t)output | (size_t)input | (size_t)mask | count) % WORD_SIZE == 0)
 		XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE);
 	else
 	{
--- StepMania-3.9-src/src/crypto51/strciphr.cpp.crypto	2005-01-03 00:21:05.000000000 +0100
+++ StepMania-3.9-src/src/crypto51/strciphr.cpp	2006-12-02 04:26:24.000000000 +0100
@@ -3,6 +3,8 @@
 #include "pch.h"
 #include "strciphr.h"
 
+#include <stdint.h>
+
 NAMESPACE_BEGIN(CryptoPP)
 
 template <class S>