[patch] Fixes gcc 4.0.x and 64 bit breakage.

scummvm.diff (text/plain), 1.62 KB, created by Ian Kumlien on 2005-08-23 06:51:40 UTC

diff -ruN scummvm-0.7.1/common/scaler.cpp scummvm-0.7.1.pom/common/scaler.cpp
--- scummvm-0.7.1/common/scaler.cpp	2004-08-10 19:46:04.000000000 +0200
+++ scummvm-0.7.1.pom/common/scaler.cpp	2005-08-23 14:57:01.000000000 +0200
@@ -123,7 +123,7 @@
 							int width, int height) {
 	uint8 *r;
 
-	assert(((int)dstPtr & 3) == 0);
+	assert(((long)dstPtr & 3) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 4) {
@@ -148,7 +148,7 @@
 	const uint32 dstPitch2 = dstPitch * 2;
 	const uint32 dstPitch3 = dstPitch * 3;
 
-	assert(((int)dstPtr & 1) == 0);
+	assert(((long)dstPtr & 1) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 6) {
diff -ruN scummvm-0.7.1/scumm/instrument.h scummvm-0.7.1.pom/scumm/instrument.h
--- scummvm-0.7.1/scumm/instrument.h	2004-01-06 13:45:30.000000000 +0100
+++ scummvm-0.7.1.pom/scumm/instrument.h	2005-08-23 15:46:17.000000000 +0200
@@ -60,7 +60,7 @@
 
 	void clear();
 	void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
-	operator int() { return (_instrument ? (int) _instrument : 255); }
+	operator int() { return (_instrument ? (long) _instrument : 255); }
 	void program (byte program, bool mt32);
 	void adlib (byte *instrument);
 	void roland (byte *instrument);
diff -ruN scummvm-0.7.1/scumm/intern.h scummvm-0.7.1.pom/scumm/intern.h
--- scummvm-0.7.1/scumm/intern.h	2005-03-12 15:21:57.000000000 +0100
+++ scummvm-0.7.1.pom/scumm/intern.h	2005-08-23 14:52:09.000000000 +0200
@@ -28,6 +28,7 @@
 
 namespace Scumm {
 
+class Win32ResExtractor;
 class NutRenderer; // V8 Font Renderer
 struct ArrayHeader;