Ver código fonte

tests: fix test for systems where widestring=unicodestring

git-svn-id: trunk@20359 -
paul 13 anos atrás
pai
commit
357d644891
1 arquivos alterados com 5 adições e 5 exclusões
  1. 5 5
      tests/test/tcpstr20.pp

+ 5 - 5
tests/test/tcpstr20.pp

@@ -20,7 +20,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
+{$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING}
 function OverAll(const S: WideString): Integer; overload;
 function OverAll(const S: WideString): Integer; overload;
 begin
 begin
   Result := 1;
   Result := 1;
@@ -42,7 +42,7 @@ begin
   Result := 4;
   Result := 4;
 end;
 end;
 
 
-{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
+{$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING}
 function OverWide(const S: WideString): Integer; overload;
 function OverWide(const S: WideString): Integer; overload;
 begin
 begin
   Result := 1;
   Result := 1;
@@ -64,7 +64,7 @@ begin
   Result := 4;
   Result := 4;
 end;
 end;
 
 
-{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
+{$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING}
 function OverAllNoUni(const S: WideString): Integer; overload;
 function OverAllNoUni(const S: WideString): Integer; overload;
 begin
 begin
   Result := 1;
   Result := 1;
@@ -81,7 +81,7 @@ begin
 end;
 end;
 {$endif}
 {$endif}
 
 
-{$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
+{$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING}
 function OverAllNoShort(const S: WideString): Integer; overload;
 function OverAllNoShort(const S: WideString): Integer; overload;
 begin
 begin
   Result := 1;
   Result := 1;
@@ -103,7 +103,7 @@ begin
   Test(OverAll(WC), 2, 2);
   Test(OverAll(WC), 2, 2);
   Test(OverWide(AC), 2, 3);
   Test(OverWide(AC), 2, 3);
   Test(OverNonWide(WC), 3, 4);
   Test(OverNonWide(WC), 3, 4);
-  {$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
+  {$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING}
   Test(OverAllNoUni(WC), 1, 5);
   Test(OverAllNoUni(WC), 1, 5);
   {$endif}
   {$endif}
   Test(OverAllNoShort(AC), 3, 6);
   Test(OverAllNoShort(AC), 3, 6);