paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 17:29:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* disable UCS4String if dynamic arrays are disabled

Browse Source 
git-svn-id: trunk@42455 -
This commit is contained in:
svenbarth 2019-07-19 11:52:51 +00:00
parent 41fa84a355
commit 48b8110e38
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/systemh.inc
View File

@ -535,7 +535,9 @@ Type
TUCS4CharArray = array[0..$effffff] of UCS4Char; TUCS4CharArray = array[0..$effffff] of UCS4Char;
{$endif CPU16} {$endif CPU16}
PUCS4CharArray = ^TUCS4CharArray; PUCS4CharArray = ^TUCS4CharArray;
{$ifdef FPC_HAS_FEATURE_DYNARRAYS}
UCS4String = array of UCS4Char; UCS4String = array of UCS4Char;
{$endif}
{$ifdef FPC_HAS_CPSTRING} {$ifdef FPC_HAS_CPSTRING}
UTF8String = type AnsiString(CP_UTF8); UTF8String = type AnsiString(CP_UTF8);

2
rtl/inc/ustringh.inc
View File

@ -149,10 +149,12 @@ function UTF8ToString(const S: array of Byte): unicodestring;
{$endif not CPUJVM} {$endif not CPUJVM}
function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif} function AnsiToUtf8(const s : RawByteString): RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif} function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLINE}inline;{$endif}
{$ifdef FPC_HAS_FEATURE_DYNARRAYS}
function UnicodeStringToUCS4String(const s : UnicodeString) : UCS4String; function UnicodeStringToUCS4String(const s : UnicodeString) : UCS4String;
function UCS4StringToUnicodeString(const s : UCS4String) : UnicodeString; function UCS4StringToUnicodeString(const s : UCS4String) : UnicodeString;
function WideStringToUCS4String(const s : WideString) : UCS4String; function WideStringToUCS4String(const s : WideString) : UCS4String;
function UCS4StringToWideString(const s : UCS4String) : WideString; function UCS4StringToWideString(const s : UCS4String) : WideString;
{$endif FPC_HAS_FEATURE_DYNARRAYS}
Procedure GetWideStringManager (Var Manager : TUnicodeStringManager); Procedure GetWideStringManager (Var Manager : TUnicodeStringManager);
Procedure SetWideStringManager (Const New : TUnicodeStringManager); Procedure SetWideStringManager (Const New : TUnicodeStringManager);

2
rtl/inc/ustrings.inc
View File

@ -2149,6 +2149,7 @@ function Utf8ToAnsi(const s : RawByteString) : RawByteString;{$ifdef SYSTEMINLIN
end; end;
{$ifdef FPC_HAS_FEATURE_DYNARRAYS}
procedure UCS4Encode(p: PWideChar; len: sizeint; out res: UCS4String); procedure UCS4Encode(p: PWideChar; len: sizeint; out res: UCS4String);
var var
i, reslen: sizeint; i, reslen: sizeint;
@ -2264,6 +2265,7 @@ function UCS4StringToWideString(const s : UCS4String) : WideString;
UCS4Decode(s,pointer(result)); UCS4Decode(s,pointer(result));
end; end;
{$endif FPC_HAS_UCS4STRING_TO_WIDESTR} {$endif FPC_HAS_UCS4STRING_TO_WIDESTR}
{$endif FPC_HAS_FEATURE_DYNARRAYS}
{$ifndef FPC_HAS_BUILTIN_WIDESTR_MANAGER} {$ifndef FPC_HAS_BUILTIN_WIDESTR_MANAGER}