Browse Source

* more darwin fixes. Export to libiconv not iconv

git-svn-id: trunk@805 -
marco 20 years ago
parent
commit
c90da53c9f
1 changed files with 8 additions and 2 deletions
  1. 8 2
      rtl/unix/cwstring.pp

+ 8 - 2
rtl/unix/cwstring.pp

@@ -38,8 +38,8 @@ Uses
   sysutils,
   initc;
 
-Const libiconvname = 'iconv';
-
+Const
+    libiconvname='iconv';
 
 { Case-mapping "arrays" }
 var
@@ -88,9 +88,15 @@ type
   nl_item = longint;
 
 function nl_langinfo(__item:nl_item):pchar;cdecl;external libiconvname name 'nl_langinfo';
+{$ifndef 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):longint;cdecl;external libiconvname name 'iconv_close';
+{$else}
+function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'libiconv_open';
+function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'libiconv';
+function iconv_close(__cd:iconv_t):longint;cdecl;external libiconvname name 'libiconv_close';
+{$endif}
 
 var
   iconv_ansi2wide,