From 0918a19225daedfbd5e23388124a5de3860d5420 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 14 Nov 2015 13:50:25 +0100 Subject: [PATCH] Fixed link issue for MacOSX 10.11 --- src/portable_c.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/portable_c.c b/src/portable_c.c index 944c996f7c7..3a79741b894 100644 --- a/src/portable_c.c +++ b/src/portable_c.c @@ -1,9 +1,13 @@ #if (defined(__APPLE__) || defined(macintosh)) && !defined(DMG_BUILD) +#include +// this hack doesn't seem to be needed on El Captain (10.11) +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 // define this before including iconv.h to avoid a mapping of // iconv_open and friends to libicon_open (done by mac ports), // while the symbols without 'lib' are linked from /usr/lib/libiconv #define LIBICONV_PLUG #endif +#endif #include // These functions are implemented in a C file, because there are different