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

This commit is contained in:
rubidium 2010-05-18 21:17:25 +00:00
parent 354645cd0a
commit 2de9e2d16b
3 changed files with 11 additions and 5 deletions

View File

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

View File

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

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 */
char *strndup(const char *s, size_t len);
#endif /* !_GNU_SOURCE */
/* 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
#else
# define DEFINE_STRCASESTR