diff --git a/tests/test/talign2.pp b/tests/test/talign2.pp index b6b08cf0ac..23eac9b3c5 100644 --- a/tests/test/talign2.pp +++ b/tests/test/talign2.pp @@ -21,7 +21,7 @@ program talign2; {$ifdef fpc} {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} {$endif} diff --git a/tests/test/tcpstr1.pp b/tests/test/tcpstr1.pp index d3a5a7114a..3f0f9a490f 100644 --- a/tests/test/tcpstr1.pp +++ b/tests/test/tcpstr1.pp @@ -1,6 +1,6 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} type diff --git a/tests/test/tcpstr13.pp b/tests/test/tcpstr13.pp index 46b3c2defc..04b71f58f2 100644 --- a/tests/test/tcpstr13.pp +++ b/tests/test/tcpstr13.pp @@ -6,7 +6,7 @@ program tcpstr13; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} type diff --git a/tests/test/tcpstr17.pp b/tests/test/tcpstr17.pp index 6bbee8c393..a49ebcecd7 100644 --- a/tests/test/tcpstr17.pp +++ b/tests/test/tcpstr17.pp @@ -8,7 +8,7 @@ program tcpstr17; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} const diff --git a/tests/test/tcpstr18.pp b/tests/test/tcpstr18.pp index 4e000eef36..a21be2c48c 100644 --- a/tests/test/tcpstr18.pp +++ b/tests/test/tcpstr18.pp @@ -8,7 +8,7 @@ program tcpstr17; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} procedure TestRawByte(const Source: RawByteString; cp: word; const reason: integer); diff --git a/tests/test/tcpstr19.pp b/tests/test/tcpstr19.pp index e655d0c646..4f049be0b8 100644 --- a/tests/test/tcpstr19.pp +++ b/tests/test/tcpstr19.pp @@ -12,7 +12,7 @@ program tcpstr19; {$endif} uses - {$ifdef unix} cwstring, {$endif} + {$ifdef unix} {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} SysUtils; var S: AnsiString; diff --git a/tests/test/tcpstr9.pp b/tests/test/tcpstr9.pp index c93cfd39bc..c5d3cbfa96 100644 --- a/tests/test/tcpstr9.pp +++ b/tests/test/tcpstr9.pp @@ -2,7 +2,7 @@ program tcpstr9; {$mode delphiunicode} {$apptype console} -{$ifdef unix} uses cwstring; {$endif} +{$ifdef unix} uses {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} begin // this test can be only run with the compiler built right now on the // same system diff --git a/tests/test/tcpstransistr2shortstring.pp b/tests/test/tcpstransistr2shortstring.pp index 095b17eadf..a21acc59ed 100644 --- a/tests/test/tcpstransistr2shortstring.pp +++ b/tests/test/tcpstransistr2shortstring.pp @@ -1,7 +1,7 @@ {$apptype console} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tcpstransistr2widechararray.pp b/tests/test/tcpstransistr2widechararray.pp index 3f52889902..b105bd08a5 100644 --- a/tests/test/tcpstransistr2widechararray.pp +++ b/tests/test/tcpstransistr2widechararray.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tcpstransistr2widechararray2.pp b/tests/test/tcpstransistr2widechararray2.pp index 4b191ac422..709ae7a5de 100644 --- a/tests/test/tcpstransistr2widechararray2.pp +++ b/tests/test/tcpstransistr2widechararray2.pp @@ -6,7 +6,7 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} {$r+} var diff --git a/tests/test/tcpstransistrcompare.pp b/tests/test/tcpstransistrcompare.pp index 4f1eb26546..662dd5b4c2 100644 --- a/tests/test/tcpstransistrcompare.pp +++ b/tests/test/tcpstransistrcompare.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstransistrcompareequal.pp b/tests/test/tcpstransistrcompareequal.pp index 40689c6f9e..c14f4111aa 100644 --- a/tests/test/tcpstransistrcompareequal.pp +++ b/tests/test/tcpstransistrcompareequal.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstransistrcopy.pp b/tests/test/tcpstransistrcopy.pp index 098a20e335..cd486c4cb7 100644 --- a/tests/test/tcpstransistrcopy.pp +++ b/tests/test/tcpstransistrcopy.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tcpstrchar2ansistr.pp b/tests/test/tcpstrchar2ansistr.pp index 97efa4b71f..990eeb7938 100644 --- a/tests/test/tcpstrchar2ansistr.pp +++ b/tests/test/tcpstrchar2ansistr.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tcpstrconcat.pp b/tests/test/tcpstrconcat.pp index 66d67651fd..1125e3550f 100644 --- a/tests/test/tcpstrconcat.pp +++ b/tests/test/tcpstrconcat.pp @@ -1,7 +1,7 @@ {$APPTYPE CONSOLE} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrconcat2.pp b/tests/test/tcpstrconcat2.pp index 5d52ef3a2b..2d978f552a 100644 --- a/tests/test/tcpstrconcat2.pp +++ b/tests/test/tcpstrconcat2.pp @@ -1,7 +1,7 @@ {$APPTYPE CONSOLE} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrconcat3.pp b/tests/test/tcpstrconcat3.pp index 6b8b821678..c6fc569562 100644 --- a/tests/test/tcpstrconcat3.pp +++ b/tests/test/tcpstrconcat3.pp @@ -1,7 +1,7 @@ {$APPTYPE CONSOLE} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrconcatmulti.pp b/tests/test/tcpstrconcatmulti.pp index 10b13bf1e2..8d3d370022 100644 --- a/tests/test/tcpstrconcatmulti.pp +++ b/tests/test/tcpstrconcatmulti.pp @@ -2,7 +2,7 @@ // test "fpc_AnsiStr_Concat_multi" with a same type(same encoding) uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrconcatmulti2.pp b/tests/test/tcpstrconcatmulti2.pp index f0200c9452..ec27816132 100644 --- a/tests/test/tcpstrconcatmulti2.pp +++ b/tests/test/tcpstrconcatmulti2.pp @@ -2,7 +2,7 @@ // test "fpc_AnsiStr_Concat_multi" with a differant types(encodings) uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrpchar2ansistr.pp b/tests/test/tcpstrpchar2ansistr.pp index 6cbab81a5a..fdbefec03d 100644 --- a/tests/test/tcpstrpchar2ansistr.pp +++ b/tests/test/tcpstrpchar2ansistr.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tcpstrsetlength.pp b/tests/test/tcpstrsetlength.pp index 18217115ae..6d811da788 100644 --- a/tests/test/tcpstrsetlength.pp +++ b/tests/test/tcpstrsetlength.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrsetlength2.pp b/tests/test/tcpstrsetlength2.pp index 44fc952b03..169c833f89 100644 --- a/tests/test/tcpstrsetlength2.pp +++ b/tests/test/tcpstrsetlength2.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/tcpstrshortstr2ansistr.pp b/tests/test/tcpstrshortstr2ansistr.pp index 54eef12c04..9b7a8ad85e 100644 --- a/tests/test/tcpstrshortstr2ansistr.pp +++ b/tests/test/tcpstrshortstr2ansistr.pp @@ -1,7 +1,7 @@ {$mode objfpc} {$H+} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/tstrutils1.pp b/tests/test/tstrutils1.pp index 17084ff554..f7c7a48c8b 100644 --- a/tests/test/tstrutils1.pp +++ b/tests/test/tstrutils1.pp @@ -8,7 +8,7 @@ program tstrutils1; uses {SysUtils, } {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} StrUtils; diff --git a/tests/test/tstrutils2.pp b/tests/test/tstrutils2.pp index cb07ed784e..0378cc243a 100644 --- a/tests/test/tstrutils2.pp +++ b/tests/test/tstrutils2.pp @@ -10,7 +10,7 @@ program tstrutils2; uses StrUtils {$ifdef unix} - ,cwstring + ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif} {$endif unix} ; diff --git a/tests/test/tunistr1.pp b/tests/test/tunistr1.pp index c4cb0d7da1..3b9cc51f3c 100644 --- a/tests/test/tunistr1.pp +++ b/tests/test/tunistr1.pp @@ -1,6 +1,6 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif unix} var diff --git a/tests/test/tunistr2.pp b/tests/test/tunistr2.pp index 8e9c1824c3..307b6e1303 100644 --- a/tests/test/tunistr2.pp +++ b/tests/test/tunistr2.pp @@ -1,6 +1,6 @@ {$ifdef UNIX} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif UNIX} var diff --git a/tests/test/tunistr4.pp b/tests/test/tunistr4.pp index 0ca80e047f..9d554c817d 100644 --- a/tests/test/tunistr4.pp +++ b/tests/test/tunistr4.pp @@ -5,7 +5,7 @@ uses {$ifdef unix} - cthreads, cwstring, + cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} Classes, SysUtils; diff --git a/tests/test/tunistr6.pp b/tests/test/tunistr6.pp index 919a2da19f..332a1cc56f 100644 --- a/tests/test/tunistr6.pp +++ b/tests/test/tunistr6.pp @@ -2,7 +2,7 @@ {$codepage utf-8} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/test/tunistr7.pp b/tests/test/tunistr7.pp index c7623793d8..d1905a792f 100644 --- a/tests/test/tunistr7.pp +++ b/tests/test/tunistr7.pp @@ -2,7 +2,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/twide1.pp b/tests/test/twide1.pp index 9300505917..afcbfe5741 100644 --- a/tests/test/twide1.pp +++ b/tests/test/twide1.pp @@ -1,6 +1,6 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif unix} var diff --git a/tests/test/twide2.pp b/tests/test/twide2.pp index 36379e43e0..c3a8d088db 100644 --- a/tests/test/twide2.pp +++ b/tests/test/twide2.pp @@ -1,6 +1,6 @@ {$ifdef UNIX} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif UNIX} var diff --git a/tests/test/twide3.pp b/tests/test/twide3.pp index 61def63c14..28388fb7e6 100644 --- a/tests/test/twide3.pp +++ b/tests/test/twide3.pp @@ -8,7 +8,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} SysUtils; diff --git a/tests/test/twide4.pp b/tests/test/twide4.pp index fec2bab611..5927f9fe6e 100644 --- a/tests/test/twide4.pp +++ b/tests/test/twide4.pp @@ -5,7 +5,7 @@ uses {$ifdef unix} - cthreads, cwstring, + cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} Classes, SysUtils; diff --git a/tests/test/twide6.pp b/tests/test/twide6.pp index 26e9ca78bb..d0a3638174 100644 --- a/tests/test/twide6.pp +++ b/tests/test/twide6.pp @@ -2,7 +2,7 @@ {$codepage utf-8} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/test/twide7.pp b/tests/test/twide7.pp index 7003d49f77..2028ed5909 100644 --- a/tests/test/twide7.pp +++ b/tests/test/twide7.pp @@ -2,7 +2,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} sysutils; diff --git a/tests/test/twrstr9.pp b/tests/test/twrstr9.pp index 404509fa87..0afce37b18 100644 --- a/tests/test/twrstr9.pp +++ b/tests/test/twrstr9.pp @@ -2,7 +2,7 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} type diff --git a/tests/test/units/system/tdir2.pp b/tests/test/units/system/tdir2.pp index 8dac0d535e..4e9541228c 100644 --- a/tests/test/units/system/tdir2.pp +++ b/tests/test/units/system/tdir2.pp @@ -15,7 +15,7 @@ Program tdir; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} procedure test(value, required: longint); diff --git a/tests/test/units/system/tfiledir.pp b/tests/test/units/system/tfiledir.pp index e434cb2db4..b95ce54921 100644 --- a/tests/test/units/system/tfiledir.pp +++ b/tests/test/units/system/tfiledir.pp @@ -3,7 +3,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/test/units/sysutils/tastrcmp.pp b/tests/test/units/sysutils/tastrcmp.pp index cfa1bad6df..131eb1ecea 100644 --- a/tests/test/units/sysutils/tastrcmp.pp +++ b/tests/test/units/sysutils/tastrcmp.pp @@ -26,7 +26,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/units/sysutils/tfexpand2.pp b/tests/test/units/sysutils/tfexpand2.pp index cc1eea1483..de93b2b5f9 100644 --- a/tests/test/units/sysutils/tfexpand2.pp +++ b/tests/test/units/sysutils/tfexpand2.pp @@ -28,7 +28,7 @@ uses PopupErr, {$endif FPC} {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} SysUtils; diff --git a/tests/test/units/sysutils/tffirst.pp b/tests/test/units/sysutils/tffirst.pp index 97da28ed29..6439af7dc7 100644 --- a/tests/test/units/sysutils/tffirst.pp +++ b/tests/test/units/sysutils/tffirst.pp @@ -4,7 +4,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} SysUtils; diff --git a/tests/test/units/sysutils/tlocale.pp b/tests/test/units/sysutils/tlocale.pp index c5304191b7..fd8fe58f6d 100644 --- a/tests/test/units/sysutils/tlocale.pp +++ b/tests/test/units/sysutils/tlocale.pp @@ -2,7 +2,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, clocale, {$endif} SysUtils; diff --git a/tests/test/units/sysutils/tstrcmp.pp b/tests/test/units/sysutils/tstrcmp.pp index f42bd7e0eb..99dccc728a 100644 --- a/tests/test/units/sysutils/tstrcmp.pp +++ b/tests/test/units/sysutils/tstrcmp.pp @@ -26,7 +26,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/test/units/sysutils/tunifile.pp b/tests/test/units/sysutils/tunifile.pp index 9449fc8d9b..4ba01ed85f 100644 --- a/tests/test/units/sysutils/tunifile.pp +++ b/tests/test/units/sysutils/tunifile.pp @@ -3,7 +3,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/test/units/sysutils/twstrcmp.pp b/tests/test/units/sysutils/twstrcmp.pp index 5a3050148f..7112837c97 100644 --- a/tests/test/units/sysutils/twstrcmp.pp +++ b/tests/test/units/sysutils/twstrcmp.pp @@ -27,7 +27,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif unix} SysUtils; diff --git a/tests/webtbs/tw10482.pp b/tests/webtbs/tw10482.pp index 790ac850e5..8273f06c70 100644 --- a/tests/webtbs/tw10482.pp +++ b/tests/webtbs/tw10482.pp @@ -4,7 +4,7 @@ program fpctest4; {$endif fpc} uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} Classes,sysutils,variants,typinfo; diff --git a/tests/webtbs/tw11791.pp b/tests/webtbs/tw11791.pp index acae631bd9..bd3b2503eb 100644 --- a/tests/webtbs/tw11791.pp +++ b/tests/webtbs/tw11791.pp @@ -1,7 +1,7 @@ {$mode objfpc}{$H+} uses -{$ifdef unix}cwstring,{$endif} +{$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif} Classes, SysUtils; diff --git a/tests/webtbs/tw12993.pp b/tests/webtbs/tw12993.pp index 0b3db8974b..c5f3f5786f 100644 --- a/tests/webtbs/tw12993.pp +++ b/tests/webtbs/tw12993.pp @@ -2,7 +2,7 @@ {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} var s: ansistring; diff --git a/tests/webtbs/tw13015.pp b/tests/webtbs/tw13015.pp index 291d4815ca..7dcb13a7bf 100644 --- a/tests/webtbs/tw13015.pp +++ b/tests/webtbs/tw13015.pp @@ -9,7 +9,7 @@ program test; uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} Classes,SysUtils,uw13015; diff --git a/tests/webtbs/tw13075.pp b/tests/webtbs/tw13075.pp index 6cda75a9f2..c60155b603 100644 --- a/tests/webtbs/tw13075.pp +++ b/tests/webtbs/tw13075.pp @@ -3,7 +3,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} Classes, SysUtils; diff --git a/tests/webtbs/tw17591.pp b/tests/webtbs/tw17591.pp index 3dfc97fa0d..1b28380e3e 100644 --- a/tests/webtbs/tw17591.pp +++ b/tests/webtbs/tw17591.pp @@ -4,7 +4,7 @@ program comparetext; uses sysutils {$ifdef unix} - ,cwstring + ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif} {$endif} ; var diff --git a/tests/webtbs/tw20962.pp b/tests/webtbs/tw20962.pp index c00bf6f015..060403d4da 100644 --- a/tests/webtbs/tw20962.pp +++ b/tests/webtbs/tw20962.pp @@ -4,7 +4,7 @@ program outpar; {$ifdef FPC}{$mode objfpc}{$h+}{$endif} {$ifdef mswindows}{$apptype console}{$endif} uses - {$ifdef FPC}{$ifdef unix}cthreads,cwstring,{$endif}{$endif} + {$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif} sysutils; {$ifndef FPC} type diff --git a/tests/webtbs/tw25198.pp b/tests/webtbs/tw25198.pp index ab764b7b99..2da36490e6 100644 --- a/tests/webtbs/tw25198.pp +++ b/tests/webtbs/tw25198.pp @@ -5,7 +5,7 @@ program concatenate_resourestrings_delphiunicode; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif} resourcestring diff --git a/tests/webtbs/tw3235a.pp b/tests/webtbs/tw3235a.pp index 8761bc0162..d23d7cdef6 100644 --- a/tests/webtbs/tw3235a.pp +++ b/tests/webtbs/tw3235a.pp @@ -1,6 +1,6 @@ program TestStrIComp; uses - {$ifdef unix}cwstring,{$endif} + {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif} SysUtils; var l: longint; diff --git a/tests/webtbs/tw3697.pp b/tests/webtbs/tw3697.pp index e3bfd1afd7..fe5070d0ff 100644 --- a/tests/webtbs/tw3697.pp +++ b/tests/webtbs/tw3697.pp @@ -2,7 +2,7 @@ { Submitted by "Matthias Hryniszak" on 2005-02-26 } { e-mail: matthias@hryniszak.de } uses - {$ifdef unix}cwstring, {$endif}SysUtils; + {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif}SysUtils; var S: WideString; diff --git a/tests/webtbs/tw4080.pp b/tests/webtbs/tw4080.pp index 05b8c3fad5..f92c4a2882 100644 --- a/tests/webtbs/tw4080.pp +++ b/tests/webtbs/tw4080.pp @@ -3,7 +3,7 @@ program tw4080; {$ifdef unix} uses - cwstring; + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif unix} var diff --git a/tests/webtbs/tw7006.pp b/tests/webtbs/tw7006.pp index f7490eab37..4e47d6da99 100644 --- a/tests/webtbs/tw7006.pp +++ b/tests/webtbs/tw7006.pp @@ -2,7 +2,7 @@ program av; {$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif} {$ifdef mswindows}{$apptype console}{$endif} uses - {$ifdef FPC}{$ifdef unix}cthreads,cwstring,{$endif}{$endif}sysutils; + {$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif}sysutils; type testrecty = record str: widestring; diff --git a/tests/webtbs/tw7758.pp b/tests/webtbs/tw7758.pp index 32bb8737d9..8de6e9f79d 100644 --- a/tests/webtbs/tw7758.pp +++ b/tests/webtbs/tw7758.pp @@ -2,7 +2,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/webtbs/tw7758a.pp b/tests/webtbs/tw7758a.pp index 2530de1808..a8f178e00e 100644 --- a/tests/webtbs/tw7758a.pp +++ b/tests/webtbs/tw7758a.pp @@ -2,7 +2,7 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} sysutils; diff --git a/tests/webtbs/tw9161.pp b/tests/webtbs/tw9161.pp index 66e903a764..ff7e369d44 100644 --- a/tests/webtbs/tw9161.pp +++ b/tests/webtbs/tw9161.pp @@ -1,6 +1,6 @@ uses {$ifdef unix} - cwstring, + {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif} variants,sysutils; var a:variant;