aboutsummaryrefslogtreecommitdiff
path: root/scummsys.h
diff options
context:
space:
mode:
authorLudvig Strigeus2001-11-14 19:33:10 +0000
committerLudvig Strigeus2001-11-14 19:33:10 +0000
commit8ae567b094b798625ffc9e4870086d8faf19c542 (patch)
treea7edb08a9cbc7a48f0401f0b3403f1210b23f9f1 /scummsys.h
parentb8d259d60eed2f8edc321dcba6116bddabbc35e8 (diff)
downloadscummvm-rg350-8ae567b094b798625ffc9e4870086d8faf19c542.tar.gz
scummvm-rg350-8ae567b094b798625ffc9e4870086d8faf19c542.tar.bz2
scummvm-rg350-8ae567b094b798625ffc9e4870086d8faf19c542.zip
gcc patch by lionel ulmer
svn-id: r3492
Diffstat (limited to 'scummsys.h')
-rw-r--r--scummsys.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/scummsys.h b/scummsys.h
index 4246b10876..7e2fb4e453 100644
--- a/scummsys.h
+++ b/scummsys.h
@@ -49,6 +49,7 @@ typedef signed long int32;
#define START_PACK_STRUCTS pack (push,1)
#define END_PACK_STRUCTS pack(pop)
+#define GCC_PACK
#elif defined(__CYGWIN__)
@@ -91,11 +92,6 @@ typedef signed long int32;
#endif
#define FORCEINLINE inline
-
-#if defined(__GNUC__)
-#define NORETURN __attribute__((__noreturn__))
-#else
-#endif
#define CDECL
typedef unsigned char byte;
@@ -107,8 +103,17 @@ typedef signed char int8;
typedef signed short int16;
typedef signed long int32;
+#if defined(__GNUC__)
+#define START_PACK_STRUCTS
+#define END_PACK_STRUCTS
+#define GCC_PACK __attribute__((packed))
+#define NORETURN __attribute__((__noreturn__))
+#else
#define START_PACK_STRUCTS pack (1)
#define END_PACK_STRUCTS pack ()
+#define GCC_PACK
+#define NORETURN
+#endif
#else
#error No system type defined