Browse Source

fpc: don't treat codepage as different if one element of array has CP_ACP codepage in fpc_AnsiStr_Concat_multi

git-svn-id: trunk@20381 -
paul 13 years ago
parent
commit
950ef49b5c
1 changed files with 4 additions and 1 deletions
  1. 4 1
      rtl/inc/astrings.inc

+ 4 - 1
rtl/inc/astrings.inc

@@ -250,7 +250,10 @@ begin
   lowstart:=low(sarr);
   lowstart:=low(sarr);
   for i:=lowstart to high(sarr) do
   for i:=lowstart to high(sarr) do
     begin
     begin
-      if (DestCP<>StringCodePage(sarr[i])) then
+      tmpCP:=StringCodePage(sarr[i]);
+      if tmpCP=CP_ACP then
+        tmpCP:=DefaultSystemCodePage;
+      if (DestCP<>tmpCp) then
         begin
         begin
           sameCP:=false;
           sameCP:=false;
           break;
           break;