浏览代码

* fixed compilation on darwin/arm after r19522
* replaced defined(arm) with defined(cpuarm) checks (cleaner)

git-svn-id: trunk@19528 -

Jonas Maebe 13 年之前
父节点
当前提交
2b63a7d66f
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      rtl/unix/cwstring.pp

+ 3 - 3
rtl/unix/cwstring.pp

@@ -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));