Browse Source

* import iconv routines as iconv_* rather than libiconv_* for darwin
as the 32 bit libraries export both variants, but the new 64 bit
ones on Mac OS X 10.5 only export iconv_*

git-svn-id: trunk@9184 -

Jonas Maebe 17 years ago
parent
commit
4d254e4de8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      rtl/unix/cwstring.pp

+ 2 - 2
rtl/unix/cwstring.pp

@@ -104,8 +104,8 @@ type
 {$ifndef beos}
 function nl_langinfo(__item:nl_item):pchar;cdecl;external libiconvname name 'nl_langinfo';
 {$endif}
-{ $ ifndef bsd}
-{$if not defined(bsd) and not defined(beos)}
+
+{$if (not defined(bsd) and not defined(beos)) or defined(darwin)}
 function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'iconv_open';
 function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'iconv';
 function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'iconv_close';