[Scummvm-cvs-logs] scummvm master -> 223794fb383637944c3b161c04ecc233a354c9ae

lordhoto lordhoto at gmail.com
Sat Mar 17 22:03:40 CET 2012


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

Summary:
223794fb38 ALL: Make use of defined() for the preprocessor consistent.


Commit: 223794fb383637944c3b161c04ecc233a354c9ae
    https://github.com/scummvm/scummvm/commit/223794fb383637944c3b161c04ecc233a354c9ae
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-03-17T14:02:44-07:00

Commit Message:
ALL: Make use of defined() for the preprocessor consistent.

This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.

Changed paths:
    audio/mods/maxtrax.h
    audio/softsynth/mt32/Structures.h
    audio/softsynth/opl/mame.cpp
    backends/fs/symbian/symbian-fs.cpp
    backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
    backends/graphics/gph/gph-graphics.cpp
    backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp
    backends/midi/stmidi.cpp
    backends/midi/timidity.cpp
    backends/mixer/symbiansdl/symbiansdl-mixer.cpp
    backends/platform/psp/psp_main.cpp
    backends/platform/psp/tests.cpp
    backends/platform/psp/tests.h
    backends/platform/psp/trace.h
    backends/platform/symbian/src/ScummApp.cpp
    backends/platform/symbian/src/ScummApp.h
    backends/platform/symbian/src/SymbianActions.cpp
    backends/platform/symbian/src/portdefs.h
    backends/timer/bada/timer.cpp
    backends/timer/psp/timer.cpp
    base/commandLine.cpp
    common/ptr.h
    common/scummsys.h
    common/singleton.h
    engines/scumm/scumm_v7.h



diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h
index c61f4e1..c45a21a 100644
--- a/audio/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -24,7 +24,7 @@
 #if !defined(ENABLE_KYRA)
 
 // normal Header Guard
-#elif !defined AUDIO_MODS_MAXTRAX_H
+#elif !defined(AUDIO_MODS_MAXTRAX_H)
 #define AUDIO_MODS_MAXTRAX_H
 
 // #define MAXTRAX_HAS_MODULATION
@@ -219,4 +219,4 @@ private:
 };
 }	// End of namespace Audio
 
-#endif // !defined AUDIO_MODS_MAXTRAX_H
+#endif // !defined(AUDIO_MODS_MAXTRAX_H)
diff --git a/audio/softsynth/mt32/Structures.h b/audio/softsynth/mt32/Structures.h
index e4d98ad..cbce89a 100644
--- a/audio/softsynth/mt32/Structures.h
+++ b/audio/softsynth/mt32/Structures.h
@@ -42,7 +42,7 @@ typedef   signed char      Bit8s;
 // Since sysex allows this memory to be written to in blocks of bytes,
 // we keep this packed so that we can copy data into the various
 // banks directly
-#if defined(_MSC_VER) || defined (__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #pragma pack(push, 1)
 #else
 #pragma pack(1)
@@ -172,7 +172,7 @@ struct MemParams {
 	} MT32EMU_ALIGN_PACKED system;
 };
 
-#if defined(_MSC_VER) || defined (__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #pragma pack(pop)
 #else
 #pragma pack()
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index dd3c354..c54f620 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -33,7 +33,7 @@
 #include "common/textconsole.h"
 #include "common/util.h"
 
-#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
+#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
 #include "common/config-manager.h"
 #endif
 
@@ -1226,7 +1226,7 @@ FM_OPL *makeAdLibOPL(int rate) {
 	// We need to emulate one YM3812 chip
 	int env_bits = FMOPL_ENV_BITS_HQ;
 	int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__) || defined(__N64__)
+#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__)
 	if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
 		env_bits = FMOPL_ENV_BITS_HQ;
 		eg_ent = FMOPL_EG_ENT_HQ;
diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp
index fc78f75..7a652fa 100644
--- a/backends/fs/symbian/symbian-fs.cpp
+++ b/backends/fs/symbian/symbian-fs.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#if defined (__SYMBIAN32__)
+#if defined(__SYMBIAN32__)
 
 #include "backends/fs/symbian/symbian-fs.h"
 #include "backends/fs/symbian/symbianstream.h"
@@ -230,4 +230,4 @@ Common::SeekableReadStream *SymbianFilesystemNode::createReadStream() {
 Common::WriteStream *SymbianFilesystemNode::createWriteStream() {
 	return SymbianStdioStream::makeFromPath(getPath(), true);
 }
-#endif //#if defined (__SYMBIAN32__)
+#endif //#if defined(__SYMBIAN32__)
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 17a9568..205dcfd 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -218,7 +218,7 @@ void DINGUXSdlGraphicsManager::internUpdateScreen() {
 	ScalerProc *scalerProc;
 	int scale1;
 
-#if defined (DEBUG) && ! defined(_WIN32_WCE) // definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
+#if defined(DEBUG) && ! defined(_WIN32_WCE) // definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
 	assert(_hwscreen != NULL);
 	assert(_hwscreen->map->sw_data != NULL);
 #endif
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index a0c1d9a..8521e88 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -245,7 +245,7 @@ void GPHGraphicsManager::internUpdateScreen() {
 	ScalerProc *scalerProc;
 	int scale1;
 
-#if defined (DEBUG)
+#if defined(DEBUG)
 	assert(_hwscreen != NULL);
 	assert(_hwscreen->map->sw_data != NULL);
 #endif
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index de9838a..a005d74 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -259,7 +259,7 @@ void LinuxmotoSdlGraphicsManager::internUpdateScreen() {
 	ScalerProc *scalerProc;
 	int scale1;
 
-#if defined (DEBUG) // definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
+#if defined(DEBUG) // definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
 	assert(_hwscreen != NULL);
 	assert(_hwscreen->map->sw_data != NULL);
 #endif
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index f3a1cad..9631c3c 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -965,7 +965,7 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
 	int scale1;
 
 	// definitions not available for non-DEBUG here. (needed this to compile in SYMBIAN32 & linux?)
-#if defined (DEBUG) && !defined(WIN32) && !defined(_WIN32_WCE)
+#if defined(DEBUG) && !defined(WIN32) && !defined(_WIN32_WCE)
 	assert(_hwscreen != NULL);
 	assert(_hwscreen->map->sw_data != NULL);
 #endif
diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp
index 53302f8..5a63268 100644
--- a/backends/midi/stmidi.cpp
+++ b/backends/midi/stmidi.cpp
@@ -36,7 +36,7 @@
 
 #include "common/scummsys.h"
 
-#if defined __MINT__
+#if defined(__MINT__)
 
 #include <osbind.h>
 #include "audio/mpu401.h"
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index 172d31e..5cefe66 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -559,4 +559,4 @@ Common::Error TimidityMusicPlugin::createInstance(MidiDriver **mididriver, MidiD
 	REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
 //#endif
 
-#endif // defined (USE_TIMIDITY)
+#endif // defined(USE_TIMIDITY)
diff --git a/backends/mixer/symbiansdl/symbiansdl-mixer.cpp b/backends/mixer/symbiansdl/symbiansdl-mixer.cpp
index d4637fd..e978e92 100644
--- a/backends/mixer/symbiansdl/symbiansdl-mixer.cpp
+++ b/backends/mixer/symbiansdl/symbiansdl-mixer.cpp
@@ -52,7 +52,7 @@ void SymbianSdlMixerManager::startAudio() {
 
 void SymbianSdlMixerManager::callbackHandler(byte *samples, int len) {
 	assert(_mixer);
-#if defined (S60) && !defined(S60V3)
+#if defined(S60) && !defined(S60V3)
 	// If not stereo then we need to downmix
 	if (_obtained.channels != 2) {
 		_mixer->mixCallback(_stereoMixBuffer, len * 2);
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index f45000f..a83a5ba 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -182,7 +182,7 @@ int main(void) {
 #endif
 
 /* unit/speed tests */
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
+#if defined(PSP_ENABLE_UNIT_TESTS) || defined(PSP_ENABLE_SPEED_TESTS)
 	PSP_INFO_PRINT("running tests\n");
 	psp_tests();
 	sceKernelSleepThread();	// that's it. That's all we're doing
diff --git a/backends/platform/psp/tests.cpp b/backends/platform/psp/tests.cpp
index 4d326f3..5c5ebb7 100644
--- a/backends/platform/psp/tests.cpp
+++ b/backends/platform/psp/tests.cpp
@@ -25,7 +25,7 @@
 
 #include "backends/platform/psp/tests.h"
 
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
+#if defined(PSP_ENABLE_UNIT_TESTS) || defined(PSP_ENABLE_SPEED_TESTS)
 
 #include "common/scummsys.h"
 #include <pspiofilemgr_fcntl.h>
@@ -729,4 +729,4 @@ void psp_tests() {
 #endif
 }
 
-#endif /* (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS) */
+#endif /* (PSP_ENABLE_UNIT_TESTS) || defined(PSP_ENABLE_SPEED_TESTS) */
diff --git a/backends/platform/psp/tests.h b/backends/platform/psp/tests.h
index 9d15881..3779cb6 100644
--- a/backends/platform/psp/tests.h
+++ b/backends/platform/psp/tests.h
@@ -26,7 +26,7 @@
 //#define PSP_ENABLE_UNIT_TESTS		// run unit tests
 //#define PSP_ENABLE_SPEED_TESTS		// run speed tests
 
-#if defined (PSP_ENABLE_UNIT_TESTS) || defined (PSP_ENABLE_SPEED_TESTS)
+#if defined(PSP_ENABLE_UNIT_TESTS) || defined(PSP_ENABLE_SPEED_TESTS)
 void psp_tests();
 #endif
 
diff --git a/backends/platform/psp/trace.h b/backends/platform/psp/trace.h
index dda258f..e27d06d 100644
--- a/backends/platform/psp/trace.h
+++ b/backends/platform/psp/trace.h
@@ -32,7 +32,7 @@
 /* Choose to print to file/screen/both */
 #ifdef __PSP_PRINT_TO_FILE__
 	#define __PSP_PRINT__(format,...)			PspDebugTrace(false, format, ## __VA_ARGS__)
-#elif defined __PSP_PRINT_TO_FILE_AND_SCREEN__
+#elif defined(__PSP_PRINT_TO_FILE_AND_SCREEN__)
 	#define __PSP_PRINT__(format,...)			PspDebugTrace(true, format, ## __VA_ARGS__)
 #else /* default - print to screen */
 	#define __PSP_PRINT__(format,...)			fprintf(stderr, format, ## __VA_ARGS__)
diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index 405fb5c..b952177 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -24,7 +24,7 @@
 
 #define _PAGESIZE_ 0x1000
 
-#if defined (__WINS__) && !defined (S60V3) && !defined (UIQ3)
+#if defined(__WINS__) && !defined(S60V3) && !defined(UIQ3)
 extern "C" int _chkstk(int /*a*/) {
 _asm {
 	push ecx
@@ -62,7 +62,7 @@ _asm {
 #ifdef EPOC_AS_APP
 
 // this function is called automatically by the SymbianOS to deliver the new CApaApplication object
-#if !defined (UIQ3) && !defined (S60V3)
+#if !defined(UIQ3) && !defined(S60V3)
 EXPORT_C
 #endif
 CApaApplication* NewApplication() {
@@ -70,7 +70,7 @@ CApaApplication* NewApplication() {
 	return new CScummApp;
 }
 
-#if defined (UIQ3) || defined (S60V3)
+#if defined(UIQ3) || defined(S60V3)
 #include <eikstart.h>
 // E32Main() contains the program's start up code, the entry point for an EXE.
 GLDEF_C TInt E32Main() {
@@ -80,7 +80,7 @@ GLDEF_C TInt E32Main() {
 
 #endif // EPOC_AS_APP
 
-#if !defined (UIQ3) && !defined (S60V3)
+#if !defined(UIQ3) && !defined(S60V3)
 GLDEF_C  TInt E32Dll(TDllReason) {
 	return KErrNone;
 }
@@ -92,7 +92,7 @@ CScummApp::CScummApp() {
 CScummApp::~CScummApp() {
 }
 
-#if defined (UIQ3)
+#if defined(UIQ3)
 #include <scummvm.rsg>
 /**
  * Returns the resource id to be used to declare the views supported by this UIQ3 app
diff --git a/backends/platform/symbian/src/ScummApp.h b/backends/platform/symbian/src/ScummApp.h
index 0b9ebcd..00d03e6 100644
--- a/backends/platform/symbian/src/ScummApp.h
+++ b/backends/platform/symbian/src/ScummApp.h
@@ -26,7 +26,7 @@
 #include <e32base.h>
 #include <sdlapp.h>
 
-#if defined (EPOC_AS_APP) && !defined (UIQ3) && !defined (S60V3)
+#if defined(EPOC_AS_APP) && !defined(UIQ3) && !defined(S60V3)
 #include "ECompXL.h"
 #endif
 
@@ -34,7 +34,7 @@ class CScummApp : public CSDLApp {
 public:
 	CScummApp();
 	~CScummApp();
-#if defined (UIQ3)
+#if defined(UIQ3)
 	/**
 	 * Returns the resource id to be used to declare the views supported by this UIQ3 app
 	 * @return TInt, resource id
@@ -43,7 +43,7 @@ public:
 #endif
 	TUid AppDllUid() const;
 	void GetDataFolder(TDes& aDataFolder);
-#if defined (EPOC_AS_APP) && !defined (UIQ3) && !defined (S60V3)
+#if defined(EPOC_AS_APP) && !defined(UIQ3) && !defined(S60V3)
 	TECompXL    iECompXL;
 #endif
 };
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index 5de386b..c47bd93 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -58,9 +58,9 @@ const Common::String actionNames[] = {
 
 #ifdef UIQ
 static const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, '9', 0, 0, SDLK_PAGEUP, 0, 0, 0, 0, 0, 0, 0};
-#elif defined (S60)
+#elif defined(S60)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9', 0, 0, 0, 0, 0, 0, 0, '0', 0, 0};
-#elif defined (S90)
+#elif defined(S90)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0 , 0, 0, 0, 0, 0, 0, 0, 0 ,0};
 #else
 const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0, 0, 0, '1', 0 ,0};
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index dd81080..1f9128a 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -125,7 +125,7 @@ typedef signed long int int32;
 		PS2. http://gcc.gnu.org/ml/gcc-bugs/2004-01/msg01596.html might have found out the same problem there
 	*/
 
-#elif defined (__WINS__) // WINS
+#elif defined(__WINS__) // WINS
 	extern "C" int symbian_snprintf(char *text, size_t maxlen, const char *fmt, ...);
 	extern "C" int symbian_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
 	#define snprintf(buf,len,args...) symbian_snprintf(buf,len,args)
diff --git a/backends/timer/bada/timer.cpp b/backends/timer/bada/timer.cpp
index faddacb..f030e06 100755
--- a/backends/timer/bada/timer.cpp
+++ b/backends/timer/bada/timer.cpp
@@ -20,7 +20,7 @@
  *

  */

 

-#if defined (BADA)

+#if defined(BADA)

 

 #include "backends/timer/bada/timer.h"

 

diff --git a/backends/timer/psp/timer.cpp b/backends/timer/psp/timer.cpp
index ce99843..6f8e4b6 100644
--- a/backends/timer/psp/timer.cpp
+++ b/backends/timer/psp/timer.cpp
@@ -36,7 +36,7 @@
 
 #include "common/scummsys.h"
 
-#if defined (__PSP__)
+#if defined(__PSP__)
 #include <pspthreadman.h>
 
 #include "common/scummsys.h"
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index d877c58..6407ab1 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -68,7 +68,7 @@ static const char HELP_STRING[] =
 	"  -z, --list-games         Display list of supported games and exit\n"
 	"  -t, --list-targets       Display list of configured targets and exit\n"
 	"  --list-saves=TARGET      Display a list of savegames for the game (TARGET) specified\n"
-#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 	"  --console                Enable the console window (default:enabled)\n"
 #endif
 	"\n"
@@ -155,7 +155,7 @@ static void usage(const char *s, ...) {
 	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
-#if !(defined(__GP32__) || defined (__SYMBIAN32__) || defined(__DS__))
+#if !(defined(__GP32__) || defined(__SYMBIAN32__) || defined(__DS__))
 	printf(USAGE_STRING, s_appName, buf, s_appName, s_appName);
 #endif
 	exit(1);
@@ -557,7 +557,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 			END_OPTION
 #endif
 
-#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 			// Optional console window on Windows (default: enabled)
 			DO_LONG_OPTION_BOOL("console")
 			END_OPTION
diff --git a/common/ptr.h b/common/ptr.h
index 725d97e..f734ec1 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -103,7 +103,7 @@ private:
  */
 template<class T>
 class SharedPtr {
-#if !defined __GNUC__ || GCC_ATLEAST(3, 0)
+#if !defined(__GNUC__) || GCC_ATLEAST(3, 0)
 	template<class T2> friend class SharedPtr;
 #endif
 public:
@@ -200,7 +200,7 @@ public:
 	 * This should just be used for debugging purposes.
 	 */
 	RefValue refCount() const { return _refCount ? *_refCount : 0; }
-#if !defined __GNUC__ || GCC_ATLEAST(3, 0)
+#if !defined(__GNUC__) || GCC_ATLEAST(3, 0)
 private:
 #endif
 	void decRef() {
diff --git a/common/scummsys.h b/common/scummsys.h
index 161613b..2f4efe7 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -319,7 +319,7 @@
 		#define scumm_va_copy va_copy
 	#elif defined(__va_copy)
 		#define scumm_va_copy __va_copy
-	#elif defined(_MSC_VER) || defined (__SYMBIAN32__)
+	#elif defined(_MSC_VER) || defined(__SYMBIAN32__)
 		#define scumm_va_copy(dst, src)       ((dst) = (src))
 	#else
 		#error scumm_va_copy undefined for this port
diff --git a/common/singleton.h b/common/singleton.h
index a4f106c..d707836 100644
--- a/common/singleton.h
+++ b/common/singleton.h
@@ -44,7 +44,7 @@ private:
 	 * and you specialise makeInstance to return an instance of a subclass.
 	 */
 	//template<class T>
-#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__WINS__)
+#if defined(_WIN32_WCE) || defined(_MSC_VER) || defined(__WINS__)
 //FIXME evc4 and msvc7 doesn't like it as private member
 public:
 #endif
diff --git a/engines/scumm/scumm_v7.h b/engines/scumm/scumm_v7.h
index 81bb25e..6fb98a0 100644
--- a/engines/scumm/scumm_v7.h
+++ b/engines/scumm/scumm_v7.h
@@ -72,7 +72,7 @@ protected:
 	int _languageIndexSize;
 	char _lastStringTag[12+1];
 
-#if defined(__SYMBIAN32__) || defined (_WIN32_WCE) // for some reason VC6 cannot find the base class TextObject
+#if defined(__SYMBIAN32__) || defined(_WIN32_WCE) // for some reason VC6 cannot find the base class TextObject
 	struct SubtitleText {
 		int16 xpos, ypos;
 		byte color;






More information about the Scummvm-git-logs mailing list