From 2b63a7d66fc15c45c9b62c5645fa20e7cd066e7a Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 22 Oct 2011 08:40:37 +0000 Subject: [PATCH] * fixed compilation on darwin/arm after r19522 * replaced defined(arm) with defined(cpuarm) checks (cleaner) git-svn-id: trunk@19528 - --- rtl/unix/cwstring.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtl/unix/cwstring.pp b/rtl/unix/cwstring.pp index 2926f3f4e8..94ce5efa5e 100644 --- a/rtl/unix/cwstring.pp +++ b/rtl/unix/cwstring.pp @@ -187,14 +187,14 @@ threadvar procedure InitThread; -{$if not(defined(darwin) and defined(arm))} var - iconvname: rawbytestring; transliterate: cint; +{$if not(defined(darwin) and defined(cpuarm))} + iconvname: rawbytestring; {$endif} begin current_DefaultSystemCodePage:=DefaultSystemCodePage; -{$if not(defined(darwin) and defined(arm))} +{$if not(defined(darwin) and defined(cpuarm))} iconvname:=win2iconv(DefaultSystemCodePage); iconv_wide2ansi:=iconv_open(pchar(iconvname),unicode_encoding2); iconv_ansi2wide:=iconv_open(unicode_encoding2,pchar(iconvname));