diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:19:05 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2022-06-07 03:19:05 +0200 |
| commit | b11c0a6721cd884d78b38b63797dfdb933004e03 (patch) | |
| tree | 629c49cda2995fafef2bf345abf31b39bd21ff69 /src/util/string.cpp | |
| parent | 827b9f8d7054158b058679999d77c1345162a293 (diff) | |
| parent | edc7df54801ab3bf30f96ac5aad6ce11a102f6b9 (diff) | |
| download | dragonfireclient-b11c0a6721cd884d78b38b63797dfdb933004e03.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/util/string.cpp')
| -rw-r--r-- | src/util/string.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp index b805b2f78..d70c26015 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -39,16 +39,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <windows.h> #endif -#ifdef __NetBSD__ - #include <sys/param.h> - #if __NetBSD_Version__ <= 999001500 - #define BSD_ICONV_USED - #endif -#elif defined(_ICONV_H_) && (defined(__FreeBSD__) || defined(__OpenBSD__) || \ - defined(__DragonFly__)) - #define BSD_ICONV_USED -#endif - #ifndef _WIN32 static bool convert(const char *to, const char *from, char *outbuf, @@ -56,11 +46,7 @@ static bool convert(const char *to, const char *from, char *outbuf, { iconv_t cd = iconv_open(to, from); -#ifdef BSD_ICONV_USED - const char *inbuf_ptr = inbuf; -#else char *inbuf_ptr = inbuf; -#endif char *outbuf_ptr = outbuf; size_t *inbuf_left_ptr = &inbuf_size; |