2
0
Эх сурвалжийг харах

* fixes bootstrapping with 2.2.x

git-svn-id: trunk@14355 -
florian 15 жил өмнө
parent
commit
a3884c4e49

+ 4 - 1
rtl/unix/cwstring.pp

@@ -181,11 +181,13 @@ procedure Wide2AnsiMove(source:pwidechar;var dest:ansistring;len:SizeInt);
     my0 : size_t;
     my0 : size_t;
     err: cint;
     err: cint;
   begin
   begin
+{$ifndef VER2_2}
     if PtrInt(iconv_wide2ansi)=-1 then
     if PtrInt(iconv_wide2ansi)=-1 then
       begin
       begin
         DefaultUnicode2AnsiMove(source,dest,len);
         DefaultUnicode2AnsiMove(source,dest,len);
 	exit;
 	exit;
       end;
       end;
+{$endif VER2_2}
     mynil:=nil;
     mynil:=nil;
     my0:=0;
     my0:=0;
     { rought estimation }
     { rought estimation }
@@ -245,12 +247,13 @@ procedure Ansi2WideMove(source:pchar;var dest:widestring;len:SizeInt);
     my0 : size_t;
     my0 : size_t;
     err: cint;
     err: cint;
   begin
   begin
+{$ifndef VER2_2}
     if PtrInt(iconv_ansi2wide)=-1 then
     if PtrInt(iconv_ansi2wide)=-1 then
       begin
       begin
         DefaultAnsi2UnicodeMove(source,dest,len);
         DefaultAnsi2UnicodeMove(source,dest,len);
 	exit;
 	exit;
       end;
       end;
-
+{$endif VER2_2}
     mynil:=nil;
     mynil:=nil;
     my0:=0;
     my0:=0;
     // extra space
     // extra space