瀏覽代碼

* disable UCS4String if dynamic arrays are disabled

git-svn-id: trunk@42455 -
svenbarth 6 年之前
父節點
當前提交
48b8110e38
共有 3 個文件被更改,包括 6 次插入0 次删除
  1. 2 0
      rtl/inc/systemh.inc
  2. 2 0
      rtl/inc/ustringh.inc
  3. 2 0
      rtl/inc/ustrings.inc

+ 2 - 0
rtl/inc/systemh.inc

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

+ 2 - 0
rtl/inc/ustringh.inc

@@ -149,10 +149,12 @@ function UTF8ToString(const S: array of Byte): unicodestring;
 {$endif not CPUJVM}
 function AnsiToUtf8(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 UCS4StringToUnicodeString(const s : UCS4String) : UnicodeString;
 function WideStringToUCS4String(const s : WideString) : UCS4String;
 function UCS4StringToWideString(const s : UCS4String) : WideString;
+{$endif FPC_HAS_FEATURE_DYNARRAYS}
 
 Procedure GetWideStringManager (Var Manager : TUnicodeStringManager);
 Procedure SetWideStringManager (Const New : TUnicodeStringManager);

+ 2 - 0
rtl/inc/ustrings.inc

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