[Scummvm-cvs-logs] SF.net SVN: scummvm: [29205] scummvm/trunk/common
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Sat Oct 13 17:44:57 CEST 2007
Revision: 29205
http://scummvm.svn.sourceforge.net/scummvm/?rev=29205&view=rev
Author: agent-q
Date: 2007-10-13 08:44:56 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
Added extra includes for the DS port now that stdafx.h is no longer included
Modified Paths:
--------------
scummvm/trunk/common/file.cpp
scummvm/trunk/common/scummsys.h
scummvm/trunk/common/util.cpp
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2007-10-13 15:41:34 UTC (rev 29204)
+++ scummvm/trunk/common/file.cpp 2007-10-13 15:44:56 UTC (rev 29205)
@@ -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
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2007-10-13 15:41:34 UTC (rev 29204)
+++ scummvm/trunk/common/scummsys.h 2007-10-13 15:44:56 UTC (rev 29205)
@@ -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 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)
//
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2007-10-13 15:41:34 UTC (rev 29204)
+++ scummvm/trunk/common/util.cpp 2007-10-13 15:44:56 UTC (rev 29205)
@@ -43,6 +43,8 @@
#endif
#ifdef __DS__
+ #include "ds-fs.h"
+
#undef stderr
#undef stdout
#undef stdin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list