瀏覽代碼

* Added ICU version of Android 4.1.
* Increment by 2 when finding an unknown ICU version.

git-svn-id: branches/targetandroid@23483 -

yury 12 年之前
父節點
當前提交
9471fb4f9e
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      rtl/android/cwstring.pp

+ 4 - 3
rtl/android/cwstring.pp

@@ -486,7 +486,7 @@ var
   end;
 
 const
-  ICUver: array [1..4] of ansistring = ('3_8', '4_2', '44', '46');
+  ICUver: array [1..5] of ansistring = ('3_8', '4_2', '44', '46', '48');
   TestProcName = 'ucnv_open';
 
 var
@@ -511,14 +511,15 @@ begin
   if LibVer = '' then begin
     // Finding unknown ICU version
     Val(ICUver[High(ICUver)], i);
-    for i:=i + 1 to 100 do begin
+    repeat
+      Inc(i, 2);
       Str(i, s);
       s:='_'  + s;
       if GetProcedureAddress(hlibICU, TestProcName + s) <> nil then begin
         LibVer:=s;
         break;
       end;
-    end;
+    until i >= 100;
   end;
 
   if LibVer = '' then begin