paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-27 12:50:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

o patch from Olivier for Haiku libiconv functionality (mantis #15906):

Browse Source 
* Haiku's nl_langinfo implementation is now used under Haiku instead of
      the BeOS stub.
    * Fix linking to iconv in the iconvenc package. The prefix has change
      since the previous Haiku's version.

git-svn-id: trunk@14995 -
This commit is contained in:
Jonas Maebe 2010-03-09 09:58:14 +00:00
parent 0dd62e7d05
commit 3ea3a41d2a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/iconvenc/src/iconvenc.pas
View File

@ -59,7 +59,7 @@ Const
{$endif}
{$endif}
{$if defined(darwin) and defined(cpupowerpc32)}
{$if (defined(darwin) and defined(cpupowerpc32)) or defined(haiku)}
iconvprefix='lib';
{$else}
iconvprefix='';

12
rtl/unix/cwstring.pp
View File

@ -29,6 +29,7 @@ implementation
{$if not defined(linux) and not defined(solaris)} // Linux (and maybe glibc platforms in general), have iconv in glibc.
{$if defined(haiku)}
{$linklib textencoding}
{$linklib locale}
{$else}
{$linklib iconv}
{$endif}
@ -132,8 +133,13 @@ type
piconv_t = ^iconv_t;
iconv_t = pointer;
nl_item = cint;
{$ifndef beos}
function nl_langinfo(__item:nl_item):pchar;cdecl;external libiconvname name 'nl_langinfo';
{$ifdef haiku}
function nl_langinfo(__item:nl_item):pchar;cdecl;external 'locale' name 'nl_langinfo';
{$else}
{$ifndef beos}
function nl_langinfo(__item:nl_item):pchar;cdecl;external libiconvname name 'nl_langinfo';
{$endif}
{$endif}
{$if (not defined(bsd) and not defined(beos)) or (defined(darwin) and not defined(cpupowerpc32))}
@ -153,7 +159,7 @@ threadvar
iconv_ansi2wide,
iconv_wide2ansi : iconv_t;
{$ifdef beos}
{$if defined(beos) and not defined(haiku)}
function nl_langinfo(__item:nl_item):pchar;
begin
{$warning TODO BeOS nl_langinfo or more uptodate port of iconv...}