diff options
| author | savilli <78875209+savilli@users.noreply.github.com> | 2022-06-05 16:20:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-05 15:20:29 +0200 |
| commit | 1f39948bc3341af99a1a2dfc39e4b4164ab56f4c (patch) | |
| tree | 78e885c78337088dbb50deb9883c0a87a3840d1f | |
| parent | e82985c0a1b5d828cb0cbb4d76cdf7085dfec682 (diff) | |
| download | minetest-1f39948bc3341af99a1a2dfc39e4b4164ab56f4c.tar.gz minetest-1f39948bc3341af99a1a2dfc39e4b4164ab56f4c.tar.bz2 minetest-1f39948bc3341af99a1a2dfc39e4b4164ab56f4c.zip | |
Fix BSD iconv declaration
| -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; |