--- Merging r20653 into '.':

C    rtl/unix/cwstring.pp
Summary of conflicts:
  Text conflicts: 1

# revisions: 20653
r20653 | jonas | 2012-03-29 19:13:29 +0200 (Thu, 29 Mar 2012) | 3 lines
Changed paths:
   M /trunk/rtl/unix/cwstring.pp

  * use same defaults for iPhoneSimulator as for iOS (UTF-8 etc, newer
    iPhoneSimulator platforms no longer inherit the Mac OS X settings)

git-svn-id: branches/fixes_2_6@22594 -

rtl/unix/cwstring.pp

@@ -754,7 +754,7 @@ end;
 
 procedure InitThread;
 begin
-{$if not(defined(darwin) and defined(arm))}
+{$if not(defined(darwin) and defined(arm)) and not defined(iphonesim)}
   iconv_wide2ansi:=iconv_open(nl_langinfo(CODESET),unicode_encoding2);
   iconv_ansi2wide:=iconv_open(unicode_encoding2,nl_langinfo(CODESET));
 {$else}