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

* Use default functions if call to iconv_open failed

git-svn-id: trunk@14352 -
pierre 15 жил өмнө
parent
commit
90ddd046bc

+ 11 - 0
rtl/unix/cwstring.pp

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