Skip to content

fix pinvoke signature for smc and ice error handlers for 32 bit #7774

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

Merged
merged 3 commits into from
Mar 11, 2022
Merged

fix pinvoke signature for smc and ice error handlers for 32 bit #7774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b902067
fix pinvoke signature for smc and ice error handlers for 32 bit
ahopper Mar 9, 2022
3e13e4c
Merge branch 'master' into fix-more-32bit-linux-session-manager-pinvokes
jmacato Mar 10, 2022
c3414c4
Merge branch 'master' into fix-more-32bit-linux-session-manager-pinvokes
jmacato Mar 11, 2022
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
2 changes: 1 addition & 1 deletion src/Avalonia.X11/ICELib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public delegate void IceErrorHandler(
IntPtr iceConn,
bool swap,
int offendingMinorOpcode,
ulong offendingSequence,
nuint offendingSequence,
int errorClass,
int severity,
IntPtr values
Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia.X11/SMLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public delegate void SmcErrorHandler(
IntPtr smcConn,
bool swap,
int offendingMinorOpcode,
ulong offendingSequence,
nuint offendingSequence,
int errorClass,
int severity,
IntPtr values
Expand Down
4 changes: 2 additions & 2 deletions src/Avalonia.X11/X11PlatformLifetimeEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@ private static void StaticIceIOErrorHandler(IntPtr iceConn)
}

private static void StaticErrorHandler(IntPtr smcConn, bool swap, int offendingMinorOpcode,
ulong offendingSequence, int errorClass, int severity, IntPtr values)
nuint offendingSequence, int errorClass, int severity, IntPtr values)
{
GetInstance(smcConn)
?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values);
}

// ReSharper disable UnusedParameter.Local
private void ErrorHandler(bool swap, int offendingMinorOpcode, ulong offendingSequence, int errorClass,
private void ErrorHandler(bool swap, int offendingMinorOpcode, nuint offendingSequence, int errorClass,
int severity, IntPtr values)
{
Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this,
Expand Down