aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds/arm9
diff options
context:
space:
mode:
authorMax Horn2011-05-31 13:48:03 +0200
committerMax Horn2011-05-31 13:48:03 +0200
commit9c3e2e43bde0c03ec012b83cd501a93a9ec4025e (patch)
treeb85ae443c4bd0434bc2593422d43aef559ea031e /backends/platform/ds/arm9
parentbea6858953dbcde1c6dc88345631f14d9b550ef8 (diff)
downloadscummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.tar.gz
scummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.tar.bz2
scummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.zip
COMMON: Move some code from scummsys.h to relevant portdefs.h files
Diffstat (limited to 'backends/platform/ds/arm9')
-rw-r--r--backends/platform/ds/arm9/source/portdefs.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index 580eb680eb..f512ce3ea2 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -26,8 +26,11 @@
// Include ndstypes.h for uint16 etc. typedefs
#include "nds/ndstypes.h"
-// Somebody removed these from scummsys.h, but they're still required, so I'm
-// adding them here in the hope that they'll stay.
+// Define SCUMMVM_DONT_DEFINE_TYPES to prevent scummsys.h from trying to
+// re-define those data types.
+#define SCUMMVM_DONT_DEFINE_TYPES
+
+// Include required headers
#include <stdio.h>
#include <stdlib.h>
#include <string.h>