summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2009-03-14 15:42:53 +0000
committerglx <glx@openttd.org>2009-03-14 15:42:53 +0000
commit1692ce83122d1ed15206f160aea339761b173174 (patch)
tree2f04db4dc0c398671b25c9cccf6f5503eb3877ca /src
parentaea8e7291e77859cbf5cdb04aa795a510c599504 (diff)
downloadopenttd-1692ce83122d1ed15206f160aea339761b173174.tar.xz
(svn r15710) -Fix (r15706): for non MSVC io.h needs to be included before defining unlink. Also remove redundant tchar.h includes as it is already in stdafx.h.
Diffstat (limited to 'src')
-rw-r--r--src/fios.cpp4
-rw-r--r--src/fontcache.cpp1
-rw-r--r--src/stdafx.h1
-rw-r--r--src/video/win32_v.cpp1
-rw-r--r--src/win32.cpp2
5 files changed, 1 insertions, 8 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index 951536406..3299b223e 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -12,10 +12,6 @@
#include <sys/stat.h>
#ifdef WIN32
-# include <tchar.h>
-# ifndef UNICODE
-# include <io.h>
-# endif
# define access _taccess
#else
# include <unistd.h>
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index f59d5eff9..5d9df0d03 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -38,7 +38,6 @@ enum {
* If no appropiate font is found, the function returns an error */
#ifdef WIN32
#include <windows.h>
-#include <tchar.h>
#include <shlobj.h> // SHGetFolderPath
#include "win32.h"
diff --git a/src/stdafx.h b/src/stdafx.h
index 1bb33bdd3..619fa81e7 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -247,6 +247,7 @@
#if defined(WIN32) || defined(WIN64)
char *getcwd(char *buf, size_t size);
#include <tchar.h>
+ #include <io.h>
/* XXX - WinCE without MSVCRT doesn't support wfopen, so it seems */
#if !defined(WINCE)
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 55cb54c3b..ce1c42585 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -16,7 +16,6 @@
#include "../texteff.hpp"
#include "win32_v.h"
#include <windows.h>
-#include <tchar.h>
static struct {
HWND main_wnd;
diff --git a/src/win32.cpp b/src/win32.cpp
index 9b58757e9..648a32cd7 100644
--- a/src/win32.cpp
+++ b/src/win32.cpp
@@ -14,7 +14,6 @@
#include <windows.h>
#include <winnt.h>
#include <wininet.h>
-#include <io.h>
#include <fcntl.h>
#include <shlobj.h> // SHGetFolderPath
#include "variables.h"
@@ -26,7 +25,6 @@
#include "string_func.h"
#include "gamelog.h"
#include <ctype.h>
-#include <tchar.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>