Merge commit 'dacf6cfbaa8c66ea6150f95aadad2954f116836c' into main

This commit is contained in:
Sam Lantinga 2021-03-15 09:00:30 -07:00
commit 2bd0a71821

View File

@ -31,6 +31,10 @@
#include "SDL_endian.h"
#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
#ifdef __FreeBSD__
/* Define LIBICONV_PLUG to use iconv from the base instead of ports and avoid linker errors. */
#define LIBICONV_PLUG 1
#endif
#include <iconv.h>
/* Depending on which standard the iconv() was implemented with,