Browse Source
Merge branch 'master' into fix/RenderArtifactsOnLineEnds
pull/7778/head
Jumar Macato
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
src/Avalonia.X11/ICELib.cs
-
src/Avalonia.X11/SMLib.cs
-
src/Avalonia.X11/X11PlatformLifetimeEvents.cs
|
|
|
@ -46,7 +46,7 @@ namespace Avalonia.X11 |
|
|
|
IntPtr iceConn, |
|
|
|
bool swap, |
|
|
|
int offendingMinorOpcode, |
|
|
|
ulong offendingSequence, |
|
|
|
nuint offendingSequence, |
|
|
|
int errorClass, |
|
|
|
int severity, |
|
|
|
IntPtr values |
|
|
|
|
|
|
|
@ -124,7 +124,7 @@ namespace Avalonia.X11 |
|
|
|
IntPtr smcConn, |
|
|
|
bool swap, |
|
|
|
int offendingMinorOpcode, |
|
|
|
ulong offendingSequence, |
|
|
|
nuint offendingSequence, |
|
|
|
int errorClass, |
|
|
|
int severity, |
|
|
|
IntPtr values |
|
|
|
|
|
|
|
@ -153,14 +153,14 @@ namespace Avalonia.X11 |
|
|
|
} |
|
|
|
|
|
|
|
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, |
|
|
|
|
