Add fpwidestring and unicodeducet in uses clause for go32v2 target

git-svn-id: trunk@38738 -

tests/test/twide1.pp

@@ -1,7 +1,18 @@
-{$ifdef unix}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
-{$endif unix}
+ {$ifdef unix}
+ {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
+ {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
+ {$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet;
+ {$endif}
+
   
 var
   w : widestring;

tests/test/twide2.pp

@@ -1,7 +1,17 @@
-{$ifdef UNIX}
+{$ifdef go32v2}
+  {$define USE_FPWIDESTRING_UNIT}
+  {$define USE_UNICODEDUCET_UNIT}
+{$endif}
 uses
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
-{$endif UNIX}
+ {$ifdef unix}
+ {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
+ {$endif}
+ {$ifdef USE_FPWIDESTRING_UNIT}
+  fpwidestring,
+ {$endif}
+ {$ifdef USE_UNICODEDUCET_UNIT}
+  unicodeducet;
+ {$endif}
 
 var
   i : longint;

tests/test/twide4.pp

@@ -3,10 +3,20 @@
 {$mode objfpc}
 {$endif fpc}
 
-uses
-{$ifdef unix}
-  cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+{$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}
   Classes, SysUtils;
 
 type