diff options
| author | rubidium <rubidium@openttd.org> | 2014-04-25 15:17:17 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-04-25 15:17:17 +0000 |
| commit | db8d208bfc96f5b2c38c18f4f96de47987597208 (patch) | |
| tree | de35aad176a75ef6aaa86ba71ad4e4eb78ac86f0 /src | |
| parent | e61fe2123728dd4cd2eba3ed628905b337ddff19 (diff) | |
| download | openttd-db8d208bfc96f5b2c38c18f4f96de47987597208.tar.xz | |
(svn r26507) -Cleanup: remove now unused custom strndup implementation
Diffstat (limited to 'src')
| -rw-r--r-- | src/string.cpp | 10 | ||||
| -rw-r--r-- | src/string_func.h | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/string.cpp b/src/string.cpp index 63288e431..87ea26ee7 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -528,16 +528,6 @@ size_t Utf8TrimString(char *s, size_t maxlen) 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 char *strcasestr(const char *haystack, const char *needle) { diff --git a/src/string_func.h b/src/string_func.h index 474340a69..40ea30401 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -247,14 +247,6 @@ static inline bool IsWhitespace(WChar c) #include <sys/param.h> #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 */ #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 |