[Scummvm-git-logs] scummvm master -> 8216fd8ea6edaeb46983f04d00979d82de403dc1

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6dd28d7cc1 WII: Fix compiler warnings
8216fd8ea6 Merge pull request #904 from AReim1982/DevKitPPC-R28


Commit: 6dd28d7cc15e721d15e720304dae76fca8bc653f
    https://github.com/scummvm/scummvm/commit/6dd28d7cc15e721d15e720304dae76fca8bc653f
Author: Alexander Reim (alexander at areim.de)
Date: 2017-02-14T11:38:39+01:00

Commit Message:
WII: Fix compiler warnings

WII: Fix compiler warnings

Compiler: DevKitPPC R28

Changed paths:
    backends/platform/wii/osystem.cpp
    backends/platform/wii/osystem_events.cpp
    backends/platform/wii/osystem_gfx.cpp
    backends/platform/wii/osystem_sfx.cpp


diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index ab2f2c6..c2751f6 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -229,21 +229,21 @@ void OSystem_Wii::lockMutex(MutexRef mutex) {
 	s32 res = LWP_MutexLock(*(mutex_t *)mutex);
 
 	if (res)
-		printf("ERROR locking mutex %p (%d)\n", mutex, res);
+		printf("ERROR locking mutex %p (%ld)\n", mutex, res);
 }
 
 void OSystem_Wii::unlockMutex(MutexRef mutex) {
 	s32 res = LWP_MutexUnlock(*(mutex_t *)mutex);
 
 	if (res)
-		printf("ERROR unlocking mutex %p (%d)\n", mutex, res);
+		printf("ERROR unlocking mutex %p (%ld)\n", mutex, res);
 }
 
 void OSystem_Wii::deleteMutex(MutexRef mutex) {
 	s32 res = LWP_MutexDestroy(*(mutex_t *)mutex);
 
 	if (res)
-		printf("ERROR destroying mutex %p (%d)\n", mutex, res);
+		printf("ERROR destroying mutex %p (%ld)\n", mutex, res);
 
 	free(mutex);
 }
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 13f5d1f..2499300 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -172,7 +172,7 @@ void OSystem_Wii::initEvents() {
 									TIMER_THREAD_PRIO);
 
 		if (res) {
-			printf("ERROR creating timer thread: %d\n", res);
+			printf("ERROR creating timer thread: %ld\n", res);
 			LWP_CloseQueue(timer_queue);
 		}
 
@@ -227,7 +227,9 @@ bool OSystem_Wii::pollKeyboard(Common::Event &event) {
 	int i;
 	keyboard_event kbdEvent;
 
-	if (!KEYBOARD_GetEvent(&kbdEvent) > 0)
+	s32 res = KEYBOARD_GetEvent(&kbdEvent);
+	
+	if (!res)
 		return false;
 
 	switch (kbdEvent.type) {
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index bb91242..c7989e9 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -713,7 +713,7 @@ void OSystem_Wii::setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
 			}
 
 			// nasty, shouldn't the frontend set the alpha channel?
-			u16 *s = (u16 *) buf;
+			const u16 *s = (const u16 *) buf;
 			u16 *d = (u16 *) tmp;
 			for (u16 y = 0; y < h; ++y) {
 				for (u16 x = 0; x < w; ++x) {
diff --git a/backends/platform/wii/osystem_sfx.cpp b/backends/platform/wii/osystem_sfx.cpp
index 70a440a..445bb2e 100644
--- a/backends/platform/wii/osystem_sfx.cpp
+++ b/backends/platform/wii/osystem_sfx.cpp
@@ -87,7 +87,7 @@ void OSystem_Wii::initSfx() {
 									SFX_THREAD_STACKSIZE, SFX_THREAD_PRIO);
 
 		if (res) {
-			printf("ERROR creating sfx thread: %d\n", res);
+			printf("ERROR creating sfx thread: %ld\n", res);
 			LWP_CloseQueue(sfx_queue);
 			return;
 		}


Commit: 8216fd8ea6edaeb46983f04d00979d82de403dc1
    https://github.com/scummvm/scummvm/commit/8216fd8ea6edaeb46983f04d00979d82de403dc1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-21T23:30:32+01:00

Commit Message:
Merge pull request #904 from AReim1982/DevKitPPC-R28

WII: Fix compiler warnings

Changed paths:
    backends/platform/wii/osystem.cpp
    backends/platform/wii/osystem_events.cpp
    backends/platform/wii/osystem_gfx.cpp
    backends/platform/wii/osystem_sfx.cpp