From df947d3ae8452f9e695726920db303e6ad42ac9b Mon Sep 17 00:00:00 2001 From: nickysn Date: Fri, 22 Jan 2021 00:48:44 +0000 Subject: [PATCH] * fixed rtl compilation with FPC 3.2.0 starting compiler git-svn-id: branches/wasm@48305 - --- rtl/inc/systemh.inc | 2 +- rtl/inc/ustringh.inc | 2 +- rtl/inc/wstringh.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index c50438d8b1..e7bd9148cd 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -1319,7 +1319,7 @@ function Pos(const substr : shortstring;c:char; Offset: Sizeint = 1): SizeInt; ****************************************************************************} {$ifdef FPC_HAS_FEATURE_ANSISTRINGS} -Procedure UniqueString(var S : RawByteString);{$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif FPC_HAS_CPSTRING}external name 'FPC_ANSISTR_UNIQUE';discardresult; +Procedure UniqueString(var S : RawByteString);{$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif FPC_HAS_CPSTRING}external name 'FPC_ANSISTR_UNIQUE';{$ifndef VER3_2}discardresult;{$endif VER3_2} Function Pos (const Substr : RawByteString; const Source : RawByteString; Offset: Sizeint = 1) : SizeInt; Function Pos (c : AnsiChar; const s : RawByteString; Offset: Sizeint = 1) : SizeInt; {$ifdef VER3_0} diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc index 44673eee91..99a1829a57 100644 --- a/rtl/inc/ustringh.inc +++ b/rtl/inc/ustringh.inc @@ -15,7 +15,7 @@ **********************************************************************} -Procedure UniqueString (Var S : UnicodeString);external name 'FPC_UNICODESTR_UNIQUE';discardresult; +Procedure UniqueString (Var S : UnicodeString);external name 'FPC_UNICODESTR_UNIQUE';{$ifndef VER3_2}discardresult;{$endif VER3_2} Function Pos (Const Substr : UnicodeString; Const Source : UnicodeString; Offset: Sizeint = 1) : SizeInt; Function Pos (c : Char; Const s : UnicodeString; Offset: Sizeint = 1) : SizeInt; Function Pos (c : UnicodeChar; Const s : UnicodeString; Offset: Sizeint = 1) : SizeInt; diff --git a/rtl/inc/wstringh.inc b/rtl/inc/wstringh.inc index c8ef5953f8..c365784186 100644 --- a/rtl/inc/wstringh.inc +++ b/rtl/inc/wstringh.inc @@ -15,7 +15,7 @@ **********************************************************************} -Procedure UniqueString (Var S : WideString);external name 'FPC_WIDESTR_UNIQUE';discardresult; +Procedure UniqueString (Var S : WideString);external name 'FPC_WIDESTR_UNIQUE';{$ifndef VER3_2}}discardresult;{$endif VER3_2} Function Pos (Const Substr : WideString; Const Source : WideString; Offset : SizeInt = 1) : SizeInt; Function Pos (c : Char; Const s : WideString; Offset : SizeInt = 1) : SizeInt; Function Pos (c : WideChar; Const s : WideString; Offset : SizeInt = 1) : SizeInt;