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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Jul 20 22:40:03 CEST 2006


Revision: 23456
          http://svn.sourceforge.net/scummvm/?rev=23456&view=rev
Author:   fingolfin
Date:     2006-07-09 05:45:50 -0700 (Sun, 09 Jul 2006)

Log Message:
-----------
Changed the default value of START_PACK_STRUCTS / END_PACK_STRUCTS; cleanup

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

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2006-07-09 12:27:37 UTC (rev 23455)
+++ scummvm/trunk/common/scummsys.h	2006-07-09 12:45:50 UTC (rev 23456)
@@ -83,9 +83,6 @@
 	// explains the reasons briefly.
 	#define SCUMMVM_USE_LONG_INT
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 	#if defined(CHECK_HEAP)
 	#undef CHECK_HEAP
 	#define CHECK_HEAP checkHeap();
@@ -117,9 +114,6 @@
 
 	#define SCUMM_LITTLE_ENDIAN
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 	#define PLUGIN_EXPORT __declspec(dllexport)
 
 	#ifndef _HEAPOK
@@ -159,11 +153,6 @@
 	#define SCUMM_NEED_ALIGNMENT
 	#endif
 
-	#if !defined(__GNUC__)
-	#define START_PACK_STRUCTS pack (1)
-	#define END_PACK_STRUCTS   pack ()
-	#endif
-
 #elif defined(__PALMOS_TRAPS__)	|| defined (__PALMOS_ARMLET__)
 
 	#define scumm_stricmp stricmp
@@ -177,9 +166,6 @@
 
 	#define SCUMM_NEED_ALIGNMENT
 
-	#define START_PACK_STRUCTS pack (1)
-	#define END_PACK_STRUCTS   pack ()
-
 	#include "palmversion.h"
 	#include "globals.h"
 	#include "extend.h"
@@ -205,11 +191,6 @@
 	// explains the reasons briefly.
 	#define SCUMMVM_USE_LONG_INT
 
-	#if !defined(__GNUC__)
-		#define START_PACK_STRUCTS pack (1)
-		#define END_PACK_STRUCTS   pack ()
-	#endif
-
 #elif defined(__DC__)
 
 	#define scumm_stricmp strcasecmp
@@ -218,9 +199,6 @@
 	#define SCUMM_LITTLE_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 #elif defined(__GP32__)
 
 	#define scumm_stricmp stricmp
@@ -242,9 +220,6 @@
 	typedef unsigned long int uint32;
 	typedef signed long int int32;
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 #elif defined(__PLAYSTATION2__)
 
 	#define scumm_stricmp strcasecmp
@@ -253,9 +228,6 @@
 	#define SCUMM_LITTLE_ENDIAN 
 	#define SCUMM_NEED_ALIGNMENT
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 	#define fopen(a, b)			ps2_fopen(a, b)
 	#define fclose(a)			ps2_fclose(a)
 	#define fflush(a)			ps2_fflush(a)
@@ -279,9 +251,6 @@
 	#define	SCUMM_LITTLE_ENDIAN
 	#define	SCUMM_NEED_ALIGNMENT
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 #elif defined(__amigaos4__)
 
 	#define	scumm_stricmp strcasecmp
@@ -298,9 +267,6 @@
 	#define SCUMM_LITTLE_ENDIAN	
 	#define SCUMM_NEED_ALIGNMENT
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 	#define SMALL_SCREEN_DEVICE
 
 	// Enable Symbians own datatypes
@@ -321,18 +287,12 @@
 	typedef signed long int int32;
 
 #elif defined (__DS__) //NeilM
-	#define CDECL 
-	#define SCUMM_NEED_ALIGNMENT
-	#define SCUMM_LITTLE_ENDIAN 
 
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
-	#define CHECK_HEAP
 
-	#define FORCEINLINE inline
-	#define NORETURN __attribute__((__noreturn__))
-	#define GCC_PACK __attribute__((packed))
-	#define _HEAPOK 0
+	#define SCUMM_NEED_ALIGNMENT
+	#define SCUMM_LITTLE_ENDIAN 
 
 	#include "nds/jtypes.h"
 	#include <stdarg.h>
@@ -341,11 +301,7 @@
 	#include <math.h>
     #include <time.h>
 
-	#define START_PACK_STRUCTS pack (push, 1)
-	#define END_PACK_STRUCTS	 pack(pop)
-	
 	#define STRINGBUFLEN 256
-	#define SCUMM_LITTLE_ENDIAN 
 
 #elif defined(_WIN32_WCE)
 
@@ -355,9 +311,6 @@
 
 	#define SCUMM_LITTLE_ENDIAN
 
-	#define START_PACK_STRUCTS pack(push, 1)
-	#define END_PACK_STRUCTS   pack(pop)
-
 	#if defined(CHECK_HEAP)
 	#undef CHECK_HEAP
 	#define CHECK_HEAP checkHeap();
@@ -405,8 +358,8 @@
 // Fallbacks / default values for various special macros
 //
 #ifndef START_PACK_STRUCTS
-#define	START_PACK_STRUCTS
-#define	END_PACK_STRUCTS
+#define START_PACK_STRUCTS pack(push, 1)
+#define END_PACK_STRUCTS   pack(pop)
 #endif
 
 #ifndef FORCEINLINE






More information about the Scummvm-git-logs mailing list