Merge pull request AvaloniaUI#7774 from ahopper/fix-more-32bit-linux-session-manager-pinvokes

jmacato · grokys · commit 6f4f792939df · 2022-04-25T14:09:06.000+02:00
fix pinvoke signature for smc and ice error handlers for 32 bit
diff --git a/src/Avalonia.X11/ICELib.cs b/src/Avalonia.X11/ICELib.cs
@@ -46,7 +46,7 @@ public delegate void IceErrorHandler(
             IntPtr iceConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/SMLib.cs b/src/Avalonia.X11/SMLib.cs
@@ -124,7 +124,7 @@ public delegate void SmcErrorHandler(
             IntPtr smcConn,
             bool swap,
             int offendingMinorOpcode,
-            ulong offendingSequence,
+            nuint offendingSequence,
             int errorClass,
             int severity,
             IntPtr values
diff --git a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -153,14 +153,14 @@ private static void StaticIceIOErrorHandler(IntPtr iceConn)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`private static void StaticErrorHandler(IntPtr smcConn, bool swap, int offendingMinorOpcode,`
`156`		`- ulong offendingSequence, int errorClass, int severity, IntPtr values)`
	`156`	`+ nuint offendingSequence, int errorClass, int severity, IntPtr values)`
`157`	`157`	`{`
`158`	`158`	`GetInstance(smcConn)`
`159`	`159`	`?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`// ReSharper disable UnusedParameter.Local`
`163`		`- private void ErrorHandler(bool swap, int offendingMinorOpcode, ulong offendingSequence, int errorClass,`
	`163`	`+ private void ErrorHandler(bool swap, int offendingMinorOpcode, nuint offendingSequence, int errorClass,`
`164`	`164`	`int severity, IntPtr values)`
`165`	`165`	`{`
`166`	`166`	`Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this,`