Change __PALM_OS__ with new PALMOS_68K / PALMOS_MODE

svn-id: r18971

7 files changed, 13 insertions, 15 deletions

diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index e6170bd495..627d31b2b1 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -70,7 +70,7 @@ struct ResString {
 	char string[80];
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 static ResString *string_map_table_v7;
 static ResString *string_map_table_v6;
 static ResString *string_map_table_v5;
@@ -973,7 +973,7 @@ void ValueDisplayDialog::open() {
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Dialogs)
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index 74eac91312..51aae8be25 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -213,7 +213,7 @@ struct imuseFtSeqTable {
 	byte volume;
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 extern const imuseRoomMap *_digStateMusicMap;
 extern const imuseDigTable *_digStateMusicTable;
 extern const imuseDigTable *_digSeqMusicTable;
diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/scumm/imuse_digi/dimuse_bndmgr.h
index f3953e9a47..55da423d5c 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/scumm/imuse_digi/dimuse_bndmgr.h
@@ -95,7 +95,7 @@ namespace BundleCodecs {
 
 uint32 decode12BitsSample(const byte *src, byte **dst, uint32 size);
 void initializeImcTables();
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 void releaseImcTables();
 #endif
 int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 input_size);
diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/scumm/imuse_digi/dimuse_codecs.cpp
index 46dd0c6720..e59976e73b 100644
--- a/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/scumm/imuse_digi/dimuse_codecs.cpp
@@ -54,7 +54,7 @@ uint32 decode12BitsSample(const byte *src, byte **dst, uint32 size) {
  * varies the size of each "packet" between 2 and 7 bits.
  */
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 static byte *_destImcTable = NULL;		// save 23k of memory !
 static uint32 *_destImcTable2 = NULL;
 
@@ -113,7 +113,7 @@ static const byte imxOtherTable[6][64] = {
 	}
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 void releaseImcTables() {
 	free(_destImcTable);
 	free(_destImcTable2);
@@ -123,7 +123,7 @@ void releaseImcTables() {
 void initializeImcTables() {
 	int pos;
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 	if (!_destImcTable) _destImcTable = (byte *)calloc(89, sizeof(byte));
 	if (!_destImcTable2) _destImcTable2 = (uint32 *)calloc(89 * 64, sizeof(uint32));
 #endif
@@ -670,7 +670,7 @@ int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 in
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(DimuseCodecs)
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index 9dd8b20e02..e995bab84e 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -48,7 +48,7 @@ ImuseDigiSndMgr::~ImuseDigiSndMgr() {
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {
 		closeSound(&_sounds[l]);
 	}
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 	BundleCodecs::releaseImcTables();
 #endif
 }
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index 2a3643e352..d6fe6e3509 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -83,7 +83,7 @@ static int8 codec47_table_big2[] = {
   0, 0, 0, 0, 1, 3, 4, 6, 7, 7, 7, 7, 6, 4, 3, 1,
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 static const int8 *codec47_table;
 #else
 static const int8 codec47_table[] = {
@@ -615,7 +615,7 @@ bool Codec47Decoder::decode(byte *dst, const byte *src) {
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Codec47)
@@ -627,5 +627,3 @@ _GRELEASEPTR(GBVARS_CODEC47TABLE_INDEX, GBVARS_SCUMM)
 _GEND
 
 #endif
-
-
diff --git a/scumm/sound.h b/scumm/sound.h
index 699058023f..9e0a2ece70 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -42,7 +42,7 @@ enum {
 };
 
 class Sound {
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
 public:
 #else
 protected:
@@ -54,7 +54,7 @@ protected:
 		kFlacMode
 	};
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
 protected:
 #endif
 	ScummEngine *_vm;