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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-10-12 00:45:01 +01:00
parent 29ed470e04 e2e112baaa
commit 03fbe87752
11 changed files with 107 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/stdafx.h
View File

@@ -21,7 +21,10 @@
#include <unistd.h>
#define _GNU_SOURCE
#define TROUBLED_INTS
#include <strings.h>
#endif
#if defined(__HAIKU__) || defined(__CYGWIN__)
# include <strings.h> /* strncasecmp */
#endif
/* It seems that we need to include stdint.h before anything else
@@ -98,7 +101,7 @@
#define strcasecmp stricmp
#endif
#if defined(SUNOS) || defined(HPUX)
#if defined(SUNOS) || defined(HPUX) || defined(__CYGWIN__)
#include <alloca.h>
#endif
@@ -133,7 +136,7 @@
#include <malloc.h>
#endif /* __WATCOMC__ */
#if defined(__MINGW32__) || defined(__CYGWIN__)
#if defined(__MINGW32__)
#include <malloc.h> // alloca()
#endif
@@ -303,7 +306,7 @@
typedef unsigned char byte;
/* This is already defined in unix, but not in QNX Neutrino (6.x)*/
#if (!defined(UNIX) && !defined(__CYGWIN__) && !defined(__HAIKU__)) || defined(__QNXNTO__)
#if (!defined(UNIX) && !defined(__HAIKU__)) || defined(__QNXNTO__)
typedef unsigned int uint;
#endif