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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-03 23:54:51 +01:00
parent 315eff1112 228f8fba55
commit ad1c402ad8
161 changed files with 1702 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/stdafx.h
View File

@@ -100,12 +100,6 @@
#define strcasecmp stricmp
#endif
#if defined(PSP)
#include <psptypes.h>
#include <pspdebug.h>
#include <pspthreadman.h>
#endif
#if defined(SUNOS) || defined(HPUX)
#include <alloca.h>
#endif
@@ -134,14 +128,6 @@
#define CLIB_USERGROUP_PROTOS_H
#endif /* __MORPHOS__ */
#if defined(PSP)
/* PSP can only have 10 file-descriptors open at any given time, but this
* switch only limits reads via the Fio system. So keep 2 fds free for things
* like saving a game. */
#define LIMITED_FDS 8
#define printf pspDebugScreenPrintf
#endif /* PSP */
/* Stuff for GCC */
#if defined(__GNUC__) || defined(__clang__)
#define NORETURN __attribute__ ((noreturn))
@@ -199,9 +185,7 @@
#define NTDDI_VERSION NTDDI_WIN2K // Windows 2000
#define _WIN32_WINNT 0x0500 // Windows 2000
#define _WIN32_WINDOWS 0x400 // Windows 95
#if !defined(WINCE)
#define WINVER 0x0400 // Windows NT 4.0 / Windows 95
#endif
#define WINVER 0x0400 // Windows NT 4.0 / Windows 95
#define _WIN32_IE_ 0x0401 // 4.01 (win98 and NT4SP5+)
#endif
#define NOMINMAX // Disable min/max macros in windows.h.
@@ -235,10 +219,7 @@
#define inline __forceinline
#endif
#if !defined(WINCE)
#define CDECL _cdecl
#endif
#define CDECL _cdecl
#define GCC_PACK
#define WARN_FORMAT(string, args)
#define FINAL sealed
@@ -250,10 +231,6 @@
#define FALLTHROUGH
#endif
#if defined(WINCE)
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif
#if defined(WIN32) && !defined(_WIN64) && !defined(WIN64)
#if !defined(_W64)
#define _W64
@@ -274,15 +251,8 @@
#endif
#endif
#if defined(WINCE)
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
#undef DEBUG
#else
#define strcasecmp stricmp
#define strncasecmp strnicmp
#endif
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define strtoull _strtoui64
/* MSVC doesn't have these :( */
@@ -300,10 +270,6 @@
#define SIGBUS SIGNOFP
#endif
#if defined(WINCE)
#define stredup _stredup
#endif /* WINCE */
/* NOTE: the string returned by these functions is only valid until the next
* call to the same function and is not thread- or reentrancy-safe */
#if !defined(STRGEN) && !defined(SETTINGSGEN)
@@ -312,12 +278,9 @@
#include <tchar.h>
#include <io.h>
/* XXX - WinCE without MSVCRT doesn't support wfopen, so it seems */
#if !defined(WINCE)
namespace std { using ::_tfopen; }
#define fopen(file, mode) _tfopen(OTTD2FS(file), _T(mode))
#define unlink(file) _tunlink(OTTD2FS(file))
#endif /* WINCE */
namespace std { using ::_tfopen; }
#define fopen(file, mode) _tfopen(OTTD2FS(file), _T(mode))
#define unlink(file) _tunlink(OTTD2FS(file))
const char *FS2OTTD(const TCHAR *name);
const TCHAR *OTTD2FS(const char *name, bool console_cp = false);