dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32

Browse Source
This commit is contained in:
glx
2018-12-09 02:28:14 +01:00
committed by glx22
parent 8890926b0d
commit c540d72445
25 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/strgen/strgen.cpp
View File

@@ -21,14 +21,14 @@
#include <stdarg.h>
#include <exception>
#if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__)
#if !defined(_WIN32) || defined(__CYGWIN__)
#include <unistd.h>
#include <sys/stat.h>
#endif
#if defined WIN32 || defined __WATCOMC__
#if defined(_WIN32) || defined(__WATCOMC__)
#include <direct.h>
#endif /* WIN32 || __WATCOMC__ */
#endif /* _WIN32 || __WATCOMC__ */
#ifdef __MORPHOS__
#ifdef stderr
@@ -333,9 +333,9 @@ struct HeaderFileWriter : HeaderWriter, FileWriter {
unlink(this->filename);
} else {
/* else rename tmp.xxx into filename */
#if defined(WIN32) || defined(WIN64)
# if defined(_WIN32)
unlink(this->real_filename);
#endif
# endif
if (rename(this->filename, this->real_filename) == -1) error("rename() failed");
}
}
@@ -377,7 +377,7 @@ static inline void ottd_mkdir(const char *directory)
{
/* Ignore directory creation errors; they'll surface later on, and most
* of the time they are 'directory already exists' errors anyhow. */
#if defined(WIN32) || defined(__WATCOMC__)
#if defined(_WIN32) || defined(__WATCOMC__)
mkdir(directory);
#else
mkdir(directory, 0755);