aboutsummaryrefslogtreecommitdiff
path: root/scummsys.h
diff options
context:
space:
mode:
authorLudvig Strigeus2001-11-11 16:54:45 +0000
committerLudvig Strigeus2001-11-11 16:54:45 +0000
commitb9facc7de40655b12c779b4ba2b4756847db1aff (patch)
tree12a89bc0a210ae1eb5c547e77ca2fe880ecd1d4c /scummsys.h
parent27e55e52a9c5d269875506812860177d232c7517 (diff)
downloadscummvm-rg350-b9facc7de40655b12c779b4ba2b4756847db1aff.tar.gz
scummvm-rg350-b9facc7de40655b12c779b4ba2b4756847db1aff.tar.bz2
scummvm-rg350-b9facc7de40655b12c779b4ba2b4756847db1aff.zip
implemented some sam&max specific features,
fixed some bugs svn-id: r3486
Diffstat (limited to 'scummsys.h')
-rw-r--r--scummsys.h29
1 files changed, 23 insertions, 6 deletions
diff --git a/scummsys.h b/scummsys.h
index 063e87892b..a15a2a4f20 100644
--- a/scummsys.h
+++ b/scummsys.h
@@ -19,17 +19,13 @@
*
*/
-#if defined(WIN32)
-
-/* Pragmas are VC++-specific */
#if defined(_MSC_VER)
+
#pragma warning (disable: 4244)
#pragma warning (disable: 4101)
-#endif
#define scumm_stricmp stricmp
-
#if defined(CHECK_HEAP)
#undef CHECK_HEAP
#define CHECK_HEAP checkHeap();
@@ -54,7 +50,28 @@ typedef signed long int32;
#define START_PACK_STRUCTS pack (push,1)
#define END_PACK_STRUCTS pack(pop)
-#elif defined(UNIX)
+#elif defined(__CYGWIN__)
+
+#define scumm_stricmp stricmp
+#define CHECK_HEAP
+#define SCUMM_LITTLE_ENDIAN
+
+#define FORCEINLINE inline
+#define NORETURN _declspec(noreturn)
+
+typedef unsigned char byte;
+typedef unsigned char uint8;
+typedef unsigned short uint16;
+typedef unsigned long uint32;
+typedef unsigned int uint;
+typedef signed char int8;
+typedef signed short int16;
+typedef signed long int32;
+
+#define START_PACK_STRUCTS pack (push,1)
+#define END_PACK_STRUCTS pack(pop)
+
+#elif (defined(UNIX) || defined(__APPLE__))
#define scumm_stricmp strcasecmp