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

[dhewg]

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:
a05e2b0f43 ANDROID: Fix compilation harder
f484ec302a ARM: Fix compilation really hard


Commit: a05e2b0f435f0f874b63d7c3aa22e0482bdb8772
    https://github.com/scummvm/scummvm/commit/a05e2b0f435f0f874b63d7c3aa22e0482bdb8772
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-28T11:08:52-07:00

Commit Message:
ANDROID: Fix compilation harder

Changed paths:
    audio/softsynth/eas.cpp



diff --git a/audio/softsynth/eas.cpp b/audio/softsynth/eas.cpp
index 0339492..7d17655 100644
--- a/audio/softsynth/eas.cpp
+++ b/audio/softsynth/eas.cpp
@@ -30,8 +30,11 @@
 
 #include "common/debug.h"
 #include "common/endian.h"
+#include "common/textconsole.h"
+#include "common/error.h"
 #include "common/file.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "audio/audiostream.h"
 #include "audio/mpu401.h"
 #include "audio/musicplugin.h"


Commit: f484ec302acd9d88df412d359875ac19b85210c6
    https://github.com/scummvm/scummvm/commit/f484ec302acd9d88df412d359875ac19b85210c6
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-28T11:08:52-07:00

Commit Message:
ARM: Fix compilation really hard

Changed paths:
    audio/rate_arm.cpp



diff --git a/audio/rate_arm.cpp b/audio/rate_arm.cpp
index 9c0e849..1eb55d0 100644
--- a/audio/rate_arm.cpp
+++ b/audio/rate_arm.cpp
@@ -48,6 +48,7 @@
 #include "audio/rate.h"
 #include "audio/mixer.h"
 #include "common/util.h"
+#include "common/textconsole.h"
 
 //#define DEBUG_RATECONV