diff options
| author | Joe Stringer <joe@wand.net.nz> | 2019-10-05 16:21:36 -0700 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-10-07 21:36:00 +0200 |
| commit | 66c32533ec2adfea49579e0a64e3d32de2fa438c (patch) | |
| tree | 80093a4468a6231eecf380aae3d9d9635add981b | |
| parent | dd11990ce0d3c523717c50e7a88177f5d92baa41 (diff) | |
| download | openttd-66c32533ec2adfea49579e0a64e3d32de2fa438c.tar.xz | |
Fix: [Cygwin] Fix missing definitions in stdafx
Fix the following compile errors:
In file included from openttd/src/debug.h:15:0,
from openttd/src/string.cpp:13:
openttd/src/cpu.h:35:19: error: 'uint' was not declared in this scope
bool HasCPUIDFlag(uint type, uint index, uint bit);
openttd/src/string.cpp: In function 'char* strcasestr(const char*, const char*)':
openttd/src/string.cpp:548:7: error: 'strncasecmp' was not declared in this scope
if (strncasecmp(haystack, needle, needle_len) == 0) return const_cast<char *>(haystack);
openttd/src/strgen/strgen_base.cpp: In function 'void EmitPlural(Buffer*, char*, int)':
openttd/src/core/alloc_func.hpp:136:6: error: 'alloca' was not declared in this scope
(T*)alloca((num_elements) * sizeof(T)))
Signed-off-by: Joe Stringer <joe@wand.net.nz>
| -rw-r--r-- | src/stdafx.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index b7aefb9f0..7f7f9cc6e 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -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 @@ -137,7 +140,7 @@ #include <malloc.h> #endif /* __WATCOMC__ */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) #include <malloc.h> // alloca() #endif @@ -305,7 +308,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 |