Mercurial > hg > openttd
changeset 11360:4bf4f1f53b12 draft
(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.
| author | glx <glx@openttd.org> |
|---|---|
| date | Sat, 14 Mar 2009 15:42:53 +0000 (2009-03-14) |
| parents | 9d8cfd0f6491 |
| children | 02313cc6114e |
| files | src/fios.cpp src/fontcache.cpp src/stdafx.h src/video/win32_v.cpp src/win32.cpp |
| diffstat | 5 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -38,7 +38,6 @@ * 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"
--- 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)
--- 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;
--- 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>