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

(svn r26507) -Cleanup: remove now unused custom strndup implementation

release/1.5
rubidium 2014-04-25 15:17:17 +00:00
parent e61fe21237
commit db8d208bfc
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/string.cpp
View File

@ -528,16 +528,6 @@ size_t Utf8TrimString(char *s, size_t maxlen)
return length; return length;
} }
#ifdef DEFINE_STRNDUP
char *strndup(const char *s, size_t len)
{
len = ttd_strnlen(s, len);
char *tmp = CallocT<char>(len + 1);
memcpy(tmp, s, len);
return tmp;
}
#endif /* DEFINE_STRNDUP */
#ifdef DEFINE_STRCASESTR #ifdef DEFINE_STRCASESTR
char *strcasestr(const char *haystack, const char *needle) char *strcasestr(const char *haystack, const char *needle)
{ {

8
src/string_func.h
View File

@ -247,14 +247,6 @@ static inline bool IsWhitespace(WChar c)
#include <sys/param.h> #include <sys/param.h>
#endif #endif
/* strndup is a GNU extension */
#if defined(_GNU_SOURCE) || (defined(__NetBSD_Version__) && 400000000 <= __NetBSD_Version__) || (defined(__FreeBSD_version) && 701101 <= __FreeBSD_version) || (defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200809L)
# undef DEFINE_STRNDUP
#else
# define DEFINE_STRNDUP
char *strndup(const char *s, size_t len);
#endif /* strndup is available */
/* 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))) || defined(_NETBSD_SOURCE) #if defined(_GNU_SOURCE) || (defined(__BSD_VISIBLE) && __BSD_VISIBLE) || (defined(__APPLE__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) || defined(_NETBSD_SOURCE)
# undef DEFINE_STRCASESTR # undef DEFINE_STRCASESTR