summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-31 11:51:09 +0000
committerrubidium <rubidium@openttd.org>2008-08-31 11:51:09 +0000
commit6b86de13d638ea254c7569edac97fa04431b3a97 (patch)
treede8f76db697f6689d799cb8d0b2dd162c1098c22
parentea1f180a55f66ae02f95e63d387fa445061daa25 (diff)
downloadopenttd-6b86de13d638ea254c7569edac97fa04431b3a97.tar.xz
(svn r14200) -Fix (r14199): some OSes failed to compile. Furthermore I hate wrong comments!
-rw-r--r--src/debug.cpp2
-rw-r--r--src/os/macosx/splash.cpp2
-rw-r--r--src/os2.cpp4
-rw-r--r--src/video/cocoa/cocoa_v.mm2
-rw-r--r--src/win32.cpp5
5 files changed, 7 insertions, 8 deletions
diff --git a/src/debug.cpp b/src/debug.cpp
index 44e160700..157d033ae 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -170,7 +170,7 @@ const char *GetDebugString()
}
#ifdef DEBUG_DUMP_COMMANDS
-#include "fileio.h"
+#include "fileio_func.h"
void CDECL DebugDumpCommands(const char *s, ...)
{
diff --git a/src/os/macosx/splash.cpp b/src/os/macosx/splash.cpp
index 41a714a78..909126602 100644
--- a/src/os/macosx/splash.cpp
+++ b/src/os/macosx/splash.cpp
@@ -7,7 +7,7 @@
#include "../../variables.h"
#include "../../debug.h"
#include "../../gfx_func.h"
-#include "../../fileio.h"
+#include "../../fileio_func.h"
#include "../../blitter/factory.hpp"
#include "splash.h"
diff --git a/src/os2.cpp b/src/os2.cpp
index d57708e31..f5ee66cb1 100644
--- a/src/os2.cpp
+++ b/src/os2.cpp
@@ -6,8 +6,8 @@
#include "openttd.h"
#include "variables.h"
#include "gui.h"
-#include "fileio.h"
-#include "fios.h" // opendir/readdir/closedir
+#include "fileio_func.h"
+#include "fios.h"
#include "functions.h"
#include "core/random_func.hpp"
#include "string_func.h"
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index e961bb8b6..516910509 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -60,7 +60,7 @@ extern "C" OSErr CPSSetFrontProcess(CPSProcessSerNum* psn);
#include "../../core/geometry_type.hpp"
#include "cocoa_v.h"
#include "../../blitter/factory.hpp"
-#include "../../fileio.h"
+#include "../../fileio_func.h"
#include "../../gfx_func.h"
#include "../../functions.h"
diff --git a/src/win32.cpp b/src/win32.cpp
index 3e315a037..9ee8c3000 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -8,7 +8,8 @@
#include "saveload.h"
#include "gfx_func.h"
#include "textbuf_gui.h"
-#include "fileio.h"
+#include "fileio_func.h"
+#include "fios.h"
#include "rev.h"
#include <windows.h>
#include <winnt.h>
@@ -18,8 +19,6 @@
#include <shlobj.h> // SHGetFolderPath
#include "variables.h"
#include "win32.h"
-#include "fios.h" // opendir/readdir/closedir
-#include "fileio.h"
#include "core/alloc_func.hpp"
#include "functions.h"
#include "core/random_func.hpp"