paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-26 16:17:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed compilation on darwin/arm after r19522

Browse Source 
* replaced defined(arm) with defined(cpuarm) checks (cleaner)

git-svn-id: trunk@19528 -
This commit is contained in:
Jonas Maebe 2011-10-22 08:40:37 +00:00
parent 80d08fd5be
commit 2b63a7d66f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/unix/cwstring.pp
View File

@ -187,14 +187,14 @@ threadvar
procedure InitThread; procedure InitThread;
{$if not(defined(darwin) and defined(arm))}
var var
iconvname: rawbytestring;
transliterate: cint; transliterate: cint;
{$if not(defined(darwin) and defined(cpuarm))}
iconvname: rawbytestring;
{$endif} {$endif}
begin begin
current_DefaultSystemCodePage:=DefaultSystemCodePage; current_DefaultSystemCodePage:=DefaultSystemCodePage;
{$if not(defined(darwin) and defined(arm))} {$if not(defined(darwin) and defined(cpuarm))}
iconvname:=win2iconv(DefaultSystemCodePage); iconvname:=win2iconv(DefaultSystemCodePage);
iconv_wide2ansi:=iconv_open(pchar(iconvname),unicode_encoding2); iconv_wide2ansi:=iconv_open(pchar(iconvname),unicode_encoding2);
iconv_ansi2wide:=iconv_open(unicode_encoding2,pchar(iconvname)); iconv_ansi2wide:=iconv_open(unicode_encoding2,pchar(iconvname));