Changeset - r23855:eada93ba01bc
[Not reviewed]
master
0 1 0
Joe Stringer - 5 years ago 2019-10-05 23:21:36
joe@wand.net.nz
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>
1 file changed with 7 insertions and 4 deletions:
0 comments (0 inline, 0 general)
src/stdafx.h
Show inline comments
 
@@ -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
 

	
0 comments (0 inline, 0 general)