Skip to content

Fix: update compatibility with XE2 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mobius1qwe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: update compatibility with XE2 #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions Source/libsagui.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
{$MODE DELPHI}
{$PACKRECORDS C}
{$ENDIF}
{$IFNDEF FPC}
{$IF CompilerVersion > 23}
{$LEGACYIFEND ON}
{$IFEND}
{$ENDIF}

interface

Expand Down Expand Up @@ -79,8 +84,8 @@ interface
'dylib'
{$ELSE}
'so'
{$ENDIF};
{$ENDIF}
{$IFEND};
{$IFEND}

SG_LIB_NAME = Concat(
{$IFDEF MSWINDOWS}
Expand All @@ -103,7 +108,7 @@ interface

type
cchar = Byte;
Pcchar = MarshaledAString;
Pcchar = {$IF Defined(FPC) or (CompilerVersion > 29)}MarshaledAString{$ELSE}PAnsiChar{$IFEND};
cbool = Boolean;
Pcbool = ^Boolean;
cuint16_t = UInt16;
Expand Down Expand Up @@ -758,10 +763,12 @@ SgLib = record
class procedure Done; static;
class function GetLastName: string; static;
class procedure CheckVersion(AVersion: Integer); overload; static;
// XE2 stops with an internal error (URW1147) when these two are inlined into
// another unit
class procedure CheckVersion; overload; static;
{$IFNDEF DEBUG}inline;{$ENDIF}
{$IF NOT DEFINED(DEBUG) AND (DEFINED(FPC) OR (CompilerVersion > 23))}inline;{$IFEND}
class procedure CheckLastError(ALastError: Integer); static;
{$IFNDEF DEBUG}inline;{$ENDIF}
{$IF NOT DEFINED(DEBUG) AND (DEFINED(FPC) OR (CompilerVersion > 23))}inline;{$IFEND}
class function Load(const AName: TFileName): TLibHandle; static;
class function Unload: TLibHandle; static;
class function IsLoaded: Boolean; static;
Expand Down Expand Up @@ -998,9 +1005,13 @@ class procedure SgLib.CheckLastError(ALastError: Integer);
SetString(S, @P[0], Length(Pcchar(@P[0])));
SetCodePage(RawByteString(S), CP_UTF8, False);
{$ELSE}
{$IF CompilerVersion < 30}
S := UTF8ToString(PAnsiChar(@P[0]));
{$ELSE}
S := TMarshal.ReadStringAsUtf8(TPtrWrapper.Create(@P[0]));
{$IFEND}
{$ENDIF}
E := EOSError.Create(S.TrimRight);
E := EOSError.Create(TrimRight(S));
E.ErrorCode := ALastError;
raise E;
end;
Expand Down