[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.150,1.151 sound.h,1.91,1.92

Chris Apers chrilith at users.sourceforge.net
Sat Oct 8 14:26:42 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24000

Modified Files:
	dialogs.cpp sound.h 
Log Message:
Change __PALM_OS__ with new PALMOS_68K / PALMOS_MODE

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- dialogs.cpp	1 Oct 2005 21:13:38 -0000	1.150
+++ dialogs.cpp	8 Oct 2005 21:25:09 -0000	1.151
@@ -70,7 +70,7 @@
 	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 @@
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(Dialogs)

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- sound.h	30 Jul 2005 21:11:31 -0000	1.91
+++ sound.h	8 Oct 2005 21:25:09 -0000	1.92
@@ -42,7 +42,7 @@
 };
 
 class Sound {
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
 public:
 #else
 protected:
@@ -54,7 +54,7 @@
 		kFlacMode
 	};
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_MODE
 protected:
 #endif
 	ScummEngine *_vm;





More information about the Scummvm-git-logs mailing list