mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26517) -Fix: Windows 9x (or rather non-unicode) compile failures

release/1.5
rubidium 2014-04-26 07:30:15 +00:00
parent 5ef2042819
commit 5ebf72d126
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ini.cpp
View File

@ -89,6 +89,8 @@ bool IniFile::SaveToDisk(const char *filename)
#endif #endif
#if defined(WIN32) || defined(WIN64) #if defined(WIN32) || defined(WIN64)
/* _tcsncpy = strcpy is TCHAR is char, but isn't when TCHAR is wchar. */
#undef strncpy
/* Allocate space for one more \0 character. */ /* Allocate space for one more \0 character. */
TCHAR tfilename[MAX_PATH + 1], tfile_new[MAX_PATH + 1]; TCHAR tfilename[MAX_PATH + 1], tfile_new[MAX_PATH + 1];
_tcsncpy(tfilename, OTTD2FS(filename), MAX_PATH); _tcsncpy(tfilename, OTTD2FS(filename), MAX_PATH);

4
src/os/windows/crashlog_win.cpp
View File

@ -613,6 +613,10 @@ static void SetWndSize(HWND wnd, int mode)
} }
} }
/* When TCHAR is char, then _sntprintf becomes snprintf. When TCHAR is wchar it doesn't. Likewise for strcat. */
#undef snprintf
#undef strcat
static INT_PTR CALLBACK CrashDialogFunc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK CrashDialogFunc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch (msg) { switch (msg) {

3
src/os/windows/win32.cpp
View File

@ -29,7 +29,10 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
/* Due to TCHAR, strncat and strncpy have to remain (for a while). */
#include "../../safeguards.h" #include "../../safeguards.h"
#undef strncat
#undef strncpy
static bool _has_console; static bool _has_console;
static bool _cursor_disable = true; static bool _cursor_disable = true;