From 1692ce83122d1ed15206f160aea339761b173174 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Sat, 14 Mar 2009 15:42:53 +0000
Subject: (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.

---
 src/fios.cpp          | 4 ----
 src/fontcache.cpp     | 1 -
 src/stdafx.h          | 1 +
 src/video/win32_v.cpp | 1 -
 src/win32.cpp         | 2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.2.3-54-g00ecf