Merge commit 'dacf6cfbaa8c66ea6150f95aadad2954f116836c' into main

2021-03-15 09:00:30 -07:00 · 2021-03-15 09:00:30 -07:00 · 2bd0a71821
parent 082394c6b9 dacf6cfbaa
commit 2bd0a71821
1 changed files with 4 additions and 0 deletions
--- a/src/stdlib/SDL_iconv.c
+++ b/src/stdlib/SDL_iconv.c
@ -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,