Browse Source

Add wide string needed units for go32v2 or darwin

git-svn-id: trunk@38736 -
pierre 7 years ago
parent
commit
e69a7489d9
3 changed files with 46 additions and 2 deletions
  1. 15 0
      tests/tbs/tb0462.pp
  2. 16 1
      tests/tbs/tb0488a.pp
  3. 15 1
      tests/tbs/tb0488b.pp

+ 15 - 0
tests/tbs/tb0462.pp

@@ -1,9 +1,24 @@
 { %version=1.1 }
 
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
+
 {$ifdef fpc}
 {$ifdef unix}
+  {$ifdef darwin}
+uses
+  iosxwstr;
+  {$else}
 uses
   cwstring;
+  {$endif}
+{$endif}
+{$ifdef go32v2}
+uses
+    fpwidestring,
+    unicodeducet;
 {$endif}
 {$endif}
 

+ 16 - 1
tests/tbs/tb0488a.pp

@@ -30,7 +30,22 @@
 {$R-}
 {$Q-}
 
-uses {$ifdef unix}cwstring, {$endif}SysUtils,erroru;
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
+
+uses
+{$ifdef unix}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
+SysUtils,erroru;
 
 procedure Check(a,b:ansistring);
 begin

+ 15 - 1
tests/tbs/tb0488b.pp

@@ -2,7 +2,21 @@
  This is a variation of tb0488a
 }
 
-uses {$ifdef unix}cwstring, {$endif}SysUtils,erroru;
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
+uses
+{$ifdef unix}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$endif}
+{$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+{$endif}
+{$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet,
+{$endif}
+SysUtils,erroru;
 
 procedure Check(a,b:ansistring);
 begin