From ab7fb33d67b8c54cad89187062900309f75bad2c Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Fri, 13 Apr 2018 06:22:21 +0000
Subject: [PATCH]  Restore removed ifdef UNIX around iosxwstr/cwstring unit
 loading

git-svn-id: trunk@38763 -
---
 tests/tbs/tb0462.pp     | 4 +++-
 tests/tbs/tb0488a.pp    | 4 +++-
 tests/tbs/tb0488b.pp    | 4 +++-
 tests/test/tunistr6.pp  | 4 +++-
 tests/test/tunistr7.pp  | 4 +++-
 tests/test/twide1.pp    | 4 +++-
 tests/test/twide2.pp    | 4 +++-
 tests/test/twide4.pp    | 4 +++-
 tests/test/twide6.pp    | 4 +++-
 tests/test/twide7.pp    | 4 +++-
 tests/test/twrstr9.pp   | 4 +++-
 tests/webtbs/tw10482.pp | 4 +++-
 tests/webtbs/tw11791.pp | 4 +++-
 tests/webtbs/tw13015.pp | 4 +++-
 tests/webtbs/tw13075.pp | 4 +++-
 tests/webtbs/tw17591.pp | 4 +++-
 tests/webtbs/tw19701.pp | 4 +++-
 tests/webtbs/tw25198.pp | 2 ++
 tests/webtbs/tw3235a.pp | 4 +++-
 tests/webtbs/tw3697.pp  | 4 +++-
 tests/webtbs/tw4080.pp  | 4 +++-
 tests/webtbs/tw7006.pp  | 4 +++-
 tests/webtbs/tw7758.pp  | 4 +++-
 tests/webtbs/tw7758a.pp | 4 +++-
 tests/webtbs/tw9161.pp  | 4 +++-
 25 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/tests/tbs/tb0462.pp b/tests/tbs/tb0462.pp
index bfa8f033ee..51096fb919 100644
--- a/tests/tbs/tb0462.pp
+++ b/tests/tbs/tb0462.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/tbs/tb0488a.pp b/tests/tbs/tb0488a.pp
index ae47e18af4..f9ba9bb38d 100644
--- a/tests/tbs/tb0488a.pp
+++ b/tests/tbs/tb0488a.pp
@@ -41,7 +41,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/tbs/tb0488b.pp b/tests/tbs/tb0488b.pp
index ad6993a1fe..ee9e53799b 100644
--- a/tests/tbs/tb0488b.pp
+++ b/tests/tbs/tb0488b.pp
@@ -13,7 +13,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/tunistr6.pp b/tests/test/tunistr6.pp
index c208b39aea..06fd4cd1dd 100644
--- a/tests/test/tunistr6.pp
+++ b/tests/test/tunistr6.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/tunistr7.pp b/tests/test/tunistr7.pp
index 462a88d704..0b593d50ef 100644
--- a/tests/test/tunistr7.pp
+++ b/tests/test/tunistr7.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twide1.pp b/tests/test/twide1.pp
index 7609a5283c..2b291c19a9 100644
--- a/tests/test/twide1.pp
+++ b/tests/test/twide1.pp
@@ -9,7 +9,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+   {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twide2.pp b/tests/test/twide2.pp
index 80ce9eb815..b59dfada39 100644
--- a/tests/test/twide2.pp
+++ b/tests/test/twide2.pp
@@ -9,7 +9,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twide4.pp b/tests/test/twide4.pp
index 0f31f0346c..124f2f5ae7 100644
--- a/tests/test/twide4.pp
+++ b/tests/test/twide4.pp
@@ -17,7 +17,9 @@ uses
   cthreads,
  {$endif}
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twide6.pp b/tests/test/twide6.pp
index 5fe8c23c88..2b63b72877 100644
--- a/tests/test/twide6.pp
+++ b/tests/test/twide6.pp
@@ -12,7 +12,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twide7.pp b/tests/test/twide7.pp
index f056fb2518..5c4150c944 100644
--- a/tests/test/twide7.pp
+++ b/tests/test/twide7.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/test/twrstr9.pp b/tests/test/twrstr9.pp
index 2d261a8adc..ca6311c239 100644
--- a/tests/test/twrstr9.pp
+++ b/tests/test/twrstr9.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw10482.pp b/tests/webtbs/tw10482.pp
index bf3bfbfccd..465e40aab7 100644
--- a/tests/webtbs/tw10482.pp
+++ b/tests/webtbs/tw10482.pp
@@ -13,7 +13,9 @@ program fpctest4;
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw11791.pp b/tests/webtbs/tw11791.pp
index 5e3665d15c..620cb68f46 100644
--- a/tests/webtbs/tw11791.pp
+++ b/tests/webtbs/tw11791.pp
@@ -12,7 +12,9 @@
 
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw13015.pp b/tests/webtbs/tw13015.pp
index 3955820fbf..7475356e90 100644
--- a/tests/webtbs/tw13015.pp
+++ b/tests/webtbs/tw13015.pp
@@ -19,7 +19,9 @@ program test;
 
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw13075.pp b/tests/webtbs/tw13075.pp
index 3ec28eb79e..fa2dbf7d44 100644
--- a/tests/webtbs/tw13075.pp
+++ b/tests/webtbs/tw13075.pp
@@ -13,7 +13,9 @@
 
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw17591.pp b/tests/webtbs/tw17591.pp
index ed325d531c..560f2f7b39 100644
--- a/tests/webtbs/tw17591.pp
+++ b/tests/webtbs/tw17591.pp
@@ -12,7 +12,9 @@ program comparetext;
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw19701.pp b/tests/webtbs/tw19701.pp
index 56c6fca18c..01b7f2c55f 100644
--- a/tests/webtbs/tw19701.pp
+++ b/tests/webtbs/tw19701.pp
@@ -20,7 +20,9 @@ uses
   {$endif}
  {$endif}
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw25198.pp b/tests/webtbs/tw25198.pp
index 44f44e6540..a16bdc89fe 100644
--- a/tests/webtbs/tw25198.pp
+++ b/tests/webtbs/tw25198.pp
@@ -9,8 +9,10 @@ program concatenate_resourestrings_delphiunicode;
 {$endif}
 
  {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef unix}
 uses
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
+  {$endif unix}
  {$else USE_INTERNAL_UNICODE}
 uses
  {$ifdef USE_FPWIDESTRING_UNIT}
diff --git a/tests/webtbs/tw3235a.pp b/tests/webtbs/tw3235a.pp
index 3322b83352..3fbf8d70cc 100644
--- a/tests/webtbs/tw3235a.pp
+++ b/tests/webtbs/tw3235a.pp
@@ -11,7 +11,9 @@ program TestStrIComp;
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw3697.pp b/tests/webtbs/tw3697.pp
index 6a21b4002b..b94cad9f8a 100644
--- a/tests/webtbs/tw3697.pp
+++ b/tests/webtbs/tw3697.pp
@@ -12,7 +12,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw4080.pp b/tests/webtbs/tw4080.pp
index eb807b55b6..2de35d31f0 100644
--- a/tests/webtbs/tw4080.pp
+++ b/tests/webtbs/tw4080.pp
@@ -11,7 +11,9 @@ program tw4080;
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw7006.pp b/tests/webtbs/tw7006.pp
index a480c5c5bb..225dcccc31 100644
--- a/tests/webtbs/tw7006.pp
+++ b/tests/webtbs/tw7006.pp
@@ -15,7 +15,9 @@ uses
   cthreads,
  {$endif unix}
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw7758.pp b/tests/webtbs/tw7758.pp
index 42297efd1f..f0b5d88143 100644
--- a/tests/webtbs/tw7758.pp
+++ b/tests/webtbs/tw7758.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw7758a.pp b/tests/webtbs/tw7758a.pp
index e4ab35c46a..7045d036a7 100644
--- a/tests/webtbs/tw7758a.pp
+++ b/tests/webtbs/tw7758a.pp
@@ -11,7 +11,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
diff --git a/tests/webtbs/tw9161.pp b/tests/webtbs/tw9161.pp
index 88dd8bbf82..6870dccad9 100644
--- a/tests/webtbs/tw9161.pp
+++ b/tests/webtbs/tw9161.pp
@@ -9,7 +9,9 @@
 {$endif}
 uses
  {$ifndef USE_INTERNAL_UNICODE}
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$ifdef unix}
+   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+  {$endif unix}
  {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,