[Scummvm-cvs-logs] SF.net SVN: scummvm: [23981] scummvm/trunk/common/scummsys.h

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Sep 23 13:44:10 CEST 2006


Revision: 23981
          http://svn.sourceforge.net/scummvm/?rev=23981&view=rev
Author:   kirben
Date:     2006-09-23 04:44:05 -0700 (Sat, 23 Sep 2006)

Log Message:
-----------
Re-order platform order, to avoid exclusions

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2006-09-23 11:37:05 UTC (rev 23980)
+++ scummvm/trunk/common/scummsys.h	2006-09-23 11:44:05 UTC (rev 23981)
@@ -84,14 +84,68 @@
 #define SCUMMVM_USE_PRAGMA_PACK
 
 
-#if defined(_MSC_VER) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE)
+#if defined(__SYMBIAN32__)
 
+	#define scumm_stricmp strcasecmp
+	#define scumm_strnicmp strncasecmp
+
+	#define SCUMM_LITTLE_ENDIAN	
+	#define SCUMM_NEED_ALIGNMENT
+
+	#define SMALL_SCREEN_DEVICE
+
+	// Enable Symbians own datatypes
+	// This is done for two reasons
+	// a) uint is already defined by Symbians libc component
+	// b) Symbian is using its "own" datatyping, and the Scummvm port
+	//    should follow this to ensure the best compability possible.
+	#define SCUMMVM_DONT_DEFINE_TYPES
+	typedef unsigned char byte;
+
+	typedef unsigned char uint8;
+	typedef signed char int8;
+
+	typedef unsigned short int uint16;
+	typedef signed short int int16;
+
+	typedef unsigned long int uint32;
+	typedef signed long int int32;
+
+#elif defined(_WIN32_WCE)
+
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp _strnicmp
 	#define snprintf _snprintf
 
 	#define SCUMM_LITTLE_ENDIAN
 
+	#define FORCEINLINE __forceinline
+	#define NORETURN _declspec(noreturn)
+	#define PLUGIN_EXPORT __declspec(dllexport)
+
+	#if _WIN32_WCE < 300
+	#define CDECL __cdecl
+	#define SMALL_SCREEN_DEVICE
+	#endif
+
+	typedef signed char int8_t;
+	typedef signed short int16_t;
+	typedef unsigned char uint8_t;
+	typedef unsigned short uint16_t;
+
+	#if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210)
+	typedef signed long int32_t;
+	typedef unsigned long uint32_t;
+	#endif
+
+#elif defined(_MSC_VER)
+
+	#define scumm_stricmp stricmp
+	#define scumm_strnicmp _strnicmp
+	#define snprintf _snprintf
+
+	#define SCUMM_LITTLE_ENDIAN
+
 	// FIXME: Do you really need to use 'long' on this port? Please replace
 	// this comment with a new comment that states so, and ideally also
 	// explains the reasons briefly.
@@ -259,33 +313,6 @@
 	#define	SCUMM_BIG_ENDIAN
 	#define	SCUMM_NEED_ALIGNMENT
 
-#elif defined(__SYMBIAN32__)
-
-	#define scumm_stricmp strcasecmp
-	#define scumm_strnicmp strncasecmp
-
-	#define SCUMM_LITTLE_ENDIAN	
-	#define SCUMM_NEED_ALIGNMENT
-
-	#define SMALL_SCREEN_DEVICE
-
-	// Enable Symbians own datatypes
-	// This is done for two reasons
-	// a) uint is already defined by Symbians libc component
-	// b) Symbian is using its "own" datatyping, and the Scummvm port
-	//    should follow this to ensure the best compability possible.
-	#define SCUMMVM_DONT_DEFINE_TYPES
-	typedef unsigned char byte;
-
-	typedef unsigned char uint8;
-	typedef signed char int8;
-
-	typedef unsigned short int uint16;
-	typedef signed short int int16;
-
-	typedef unsigned long int uint32;
-	typedef signed long int int32;
-
 #elif defined (__DS__) //NeilM
 
 	#define scumm_stricmp stricmp
@@ -303,33 +330,6 @@
 
 	#define STRINGBUFLEN 256
 
-#elif defined(_WIN32_WCE)
-
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp _strnicmp
-	#define snprintf _snprintf
-
-	#define SCUMM_LITTLE_ENDIAN
-
-	#define FORCEINLINE __forceinline
-	#define NORETURN _declspec(noreturn)
-	#define PLUGIN_EXPORT __declspec(dllexport)
-
-	#if _WIN32_WCE < 300
-	#define CDECL __cdecl
-	#define SMALL_SCREEN_DEVICE
-	#endif
-
-	typedef signed char int8_t;
-	typedef signed short int16_t;
-	typedef unsigned char uint8_t;
-	typedef unsigned short uint16_t;
-
-	#if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210)
-	typedef signed long int32_t;
-	typedef unsigned long uint32_t;
-	#endif
-
 #else
 	#error No system type defined
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list