[Scummvm-cvs-logs] scummvm master -> b3d8e426c258cc20cacfa1ab5f4613e40bd10c76

[Littleboy]

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:
eecd61e33d ANDROID: Allow use of abort() in JNI class
b3d8e426c2 WII: Allow use of abort in OSystem_Wii class


Commit: eecd61e33d4c15fcfc1cd9abb72c1e85fcd7a647
    https://github.com/scummvm/scummvm/commit/eecd61e33d4c15fcfc1cd9abb72c1e85fcd7a647
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-23T08:31:54-07:00

Commit Message:
ANDROID: Allow use of abort() in JNI class

Changed paths:
    backends/platform/android/jni.cpp



diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index c4daf24..e3b4ef7 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -22,8 +22,9 @@
 
 #if defined(__ANDROID__)
 
-// Allow use of stuff in <time.h>
+// Allow use of stuff in <time.h> and abort()
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+#define FORBIDDEN_SYMBOL_EXCEPTION_abort
 
 // Disable printf override in common/forbidden.h to avoid
 // clashes with log.h from the Android SDK.


Commit: b3d8e426c258cc20cacfa1ab5f4613e40bd10c76
    https://github.com/scummvm/scummvm/commit/b3d8e426c258cc20cacfa1ab5f4613e40bd10c76
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-23T08:32:39-07:00

Commit Message:
WII: Allow use of abort in OSystem_Wii class

Changed paths:
    backends/platform/wii/osystem_gfx.cpp



diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 859e3a1..443e738 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -20,6 +20,7 @@
  */
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_abort
 
 #include <malloc.h>