diff options
| author | Neil Millstone | 2007-10-13 15:44:56 +0000 |
|---|---|---|
| committer | Neil Millstone | 2007-10-13 15:44:56 +0000 |
| commit | 5ddb1b00574b22b821c9affed050186fc33cbdea (patch) | |
| tree | b5c6a208b8cd28819999353b79031637c73f1556 | |
| parent | 688f074ea549dc84fe5e477d0ee8ce85b26f1b2c (diff) | |
| download | scummvm-rg350-5ddb1b00574b22b821c9affed050186fc33cbdea.tar.gz scummvm-rg350-5ddb1b00574b22b821c9affed050186fc33cbdea.tar.bz2 scummvm-rg350-5ddb1b00574b22b821c9affed050186fc33cbdea.zip | |
Added extra includes for the DS port now that stdafx.h is no longer included
svn-id: r29205
| -rw-r--r-- | common/file.cpp | 2 | ||||
| -rw-r--r-- | common/scummsys.h | 7 | ||||
| -rw-r--r-- | common/util.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/common/file.cpp b/common/file.cpp index af91816cd7..eeecb2f7d2 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -73,6 +73,8 @@ #undef clearerr //#undef getc //#undef ferror + + #include "ds-fs.h" //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp diff --git a/common/scummsys.h b/common/scummsys.h index 46ead5f29a..748890b3be 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -26,6 +26,7 @@ #ifndef COMMON_SCUMMSYS_H #define COMMON_SCUMMSYS_H + #if defined(_WIN32_WCE) && _WIN32_WCE < 300 #define NONSTANDARD_PORT #endif @@ -37,7 +38,6 @@ // "portdefs.h" header file (and not by directly modifying this // header file). #include <portdefs.h> - #else // defined(NONSTANDARD_PORT) #if defined(WIN32) @@ -379,8 +379,9 @@ #include "nds/jtypes.h" - #define STRINGBUFLEN 256 + #define SCUMMVM_DONT_DEFINE_TYPES + #define STRINGBUFLEN 256 #define printf(fmt, ...) consolePrintf(fmt, ##__VA_ARGS__) #else @@ -438,6 +439,7 @@ // Typedef our system types unless SCUMMVM_DONT_DEFINE_TYPES is set. // #ifndef SCUMMVM_DONT_DEFINE_TYPES + typedef unsigned char byte; typedef unsigned char uint8; @@ -458,6 +460,7 @@ #endif + // // Overlay color type (FIXME: shouldn't be declared here) // diff --git a/common/util.cpp b/common/util.cpp index eaef9ce0b5..18e5848725 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -43,6 +43,8 @@ extern bool isSmartphone(void); #endif #ifdef __DS__ + #include "ds-fs.h" + #undef stderr #undef stdout #undef stdin |