BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix BSD iconv declaration

Browse Source
This commit is contained in:
savilli 2022-06-05 16:20:29 +03:00 committed by GitHub
parent e82985c0a1
commit 1f39948bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/string.cpp
View File

@ -39,16 +39,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <windows.h> #include <windows.h>
#endif #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 #ifndef _WIN32
static bool convert(const char *to, const char *from, char *outbuf, 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); iconv_t cd = iconv_open(to, from);
#ifdef BSD_ICONV_USED
const char *inbuf_ptr = inbuf;
#else
char *inbuf_ptr = inbuf; char *inbuf_ptr = inbuf;
#endif
char *outbuf_ptr = outbuf; char *outbuf_ptr = outbuf;
size_t *inbuf_left_ptr = &inbuf_size; size_t *inbuf_left_ptr = &inbuf_size;