Merge branch 'cpp-11' into crashlog_improvements

# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
This commit is contained in:
Jonathan G Rennison
2018-04-27 00:33:44 +01:00
253 changed files with 9829 additions and 2475 deletions

View File

@@ -339,10 +339,12 @@
/* MSVCRT of course has to have a different syntax for long long *sigh* */
#if defined(_MSC_VER) || defined(__MINGW32__)
#define OTTD_PRINTF64 "%I64d"
#define OTTD_PRINTF64U "%I64u"
#define OTTD_PRINTFHEX64 "%I64x"
#define PRINTF_SIZE "%Iu"
#else
#define OTTD_PRINTF64 "%lld"
#define OTTD_PRINTF64U "%llu"
#define OTTD_PRINTFHEX64 "%llx"
#define PRINTF_SIZE "%zu"
#endif