Skip to content

Commit

Permalink
Merge pull request AvaloniaUI#7774 from ahopper/fix-more-32bit-linux-…
Browse files Browse the repository at this point in the history
…session-manager-pinvokes

fix pinvoke signature for smc and ice error handlers for 32 bit
  • Loading branch information
jmacato authored and grokys committed Apr 25, 2022
1 parent 4a90d96 commit 6f4f792
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Avalonia.X11/ICELib.cs
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
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
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

0 comments on commit 6f4f792

Please sign in to comment.