diff options
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/psp/psp_main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/psp/tests.cpp | 4 | ||||
-rw-r--r-- | backends/platform/psp/tests.h | 2 | ||||
-rw-r--r-- | backends/platform/psp/trace.h | 2 | ||||
-rw-r--r-- | backends/platform/symbian/src/ScummApp.cpp | 10 | ||||
-rw-r--r-- | backends/platform/symbian/src/ScummApp.h | 6 | ||||
-rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 4 | ||||
-rw-r--r-- | backends/platform/symbian/src/portdefs.h | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp index f45000fea4..a83a5bae71 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 4d326f30bd..5c5ebb7a80 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 9d158812f9..3779cb6bb2 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 dda258f2cb..e27d06d8d3 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 405fb5c3c2..b952177f9a 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 0b9ebcdf53..00d03e6d7b 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 5de386b1da..c47bd93772 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 dd81080afe..1f9128a54f 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) |