mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19853) -Fix [FS#3840]: revert r19781 and apply a more sensible version with the same effect

release/1.1
rubidium 2010-05-18 21:17:25 +00:00
parent 354645cd0a
commit 2de9e2d16b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/unix/crashlog_unix.cpp
View File

@ -27,6 +27,10 @@
# include <dlfcn.h> # include <dlfcn.h>
#endif #endif
#if defined(__NetBSD__)
#include <unistd.h>
#endif
/** /**
* Unix implementation for the crash logger. * Unix implementation for the crash logger.
*/ */

3
src/stdafx.h
View File

@ -24,9 +24,6 @@
#elif defined(__NDS__) #elif defined(__NDS__)
#include <nds/jtypes.h> #include <nds/jtypes.h>
#define TROUBLED_INTS #define TROUBLED_INTS
#elif defined(__NetBSD__)
#include <unistd.h>
#define _GNU_SOURCE
#endif #endif
/* It seems that we need to include stdint.h before anything else /* It seems that we need to include stdint.h before anything else

9
src/string_func.h
View File

@ -246,13 +246,18 @@ static inline bool IsWhitespace(WChar c)
; ;
} }
#ifndef _GNU_SOURCE /* Needed for NetBSD version (so feature) testing */
#ifdef __NetBSD__
#include <sys/param.h>
#endif
#if !defined(_GNU_SOURCE) && !(defined(__NetBSD_Version__) && 400000000 < __NetBSD_Version__ )
/* strndup is a GNU extension */ /* strndup is a GNU extension */
char *strndup(const char *s, size_t len); char *strndup(const char *s, size_t len);
#endif /* !_GNU_SOURCE */ #endif /* !_GNU_SOURCE */
/* strcasestr is available for _GNU_SOURCE, BSD and some Apple */ /* strcasestr is available for _GNU_SOURCE, BSD and some Apple */
#if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) #if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) || _NETBSD_SOURCE
# undef DEFINE_STRCASESTR # undef DEFINE_STRCASESTR
#else #else
# define DEFINE_STRCASESTR # define DEFINE_STRCASESTR