rtl: manual merge some cpstrnew changes which was impossible to merge using regular tools due to the merge conflicts

git-svn-id: trunk@19137 -

rtl/unix/cwstring.pp

@@ -190,7 +190,7 @@ procedure Wide2AnsiMove(source:pwidechar; var dest:RawByteString; cp:TSystemCode
 {$ifndef VER2_2}
     if PtrInt(iconv_wide2ansi)=-1 then
       begin
-        DefaultUnicode2AnsiMove(source,dest,len);
+        DefaultUnicode2AnsiMove(source,dest,DefaultSystemCodePage,len);
         exit;
       end;
 {$endif VER2_2}
@@ -256,7 +256,7 @@ procedure Ansi2WideMove(source:pchar; cp:TSystemCodePage; var dest:widestring; l
 {$ifndef VER2_2}
     if PtrInt(iconv_ansi2wide)=-1 then
       begin
-        DefaultAnsi2UnicodeMove(source,dest,len);
+        DefaultAnsi2UnicodeMove(source,DefaultSystemCodePage,dest,len);
         exit;
       end;
 {$endif VER2_2}