--- scumm/instrument.h.orig	2005-05-30 20:55:22.000000000 +0200
+++ scumm/instrument.h	2005-05-30 20:55:57.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 ? (intptr_t) _instrument : 255); }
 	void program (byte program, bool mt32);
 	void adlib (byte *instrument);
 	void roland (byte *instrument);
--- common/scaler.cpp.orig	2005-05-31 09:25:31.000000000 +0200
+++ common/scaler.cpp	2005-05-31 09:27:16.000000000 +0200
@@ -123,7 +123,7 @@
 							int width, int height) {
 	uint8 *r;
 
-	assert(((int)dstPtr & 3) == 0);
+	assert(((intptr_t)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(((intptr_t)dstPtr & 1) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 6) {
