Browse Source

Merge branch 'master' into fix/RenderArtifactsOnLineEnds

pull/7778/head
Jumar Macato 4 years ago
committed by GitHub
parent
commit
f97dfd14de
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.X11/ICELib.cs
  2. 2
      src/Avalonia.X11/SMLib.cs
  3. 4
      src/Avalonia.X11/X11PlatformLifetimeEvents.cs

2
src/Avalonia.X11/ICELib.cs

@ -46,7 +46,7 @@ namespace Avalonia.X11
IntPtr iceConn, IntPtr iceConn,
bool swap, bool swap,
int offendingMinorOpcode, int offendingMinorOpcode,
ulong offendingSequence, nuint offendingSequence,
int errorClass, int errorClass,
int severity, int severity,
IntPtr values IntPtr values

2
src/Avalonia.X11/SMLib.cs

@ -124,7 +124,7 @@ namespace Avalonia.X11
IntPtr smcConn, IntPtr smcConn,
bool swap, bool swap,
int offendingMinorOpcode, int offendingMinorOpcode,
ulong offendingSequence, nuint offendingSequence,
int errorClass, int errorClass,
int severity, int severity,
IntPtr values IntPtr values

4
src/Avalonia.X11/X11PlatformLifetimeEvents.cs

@ -153,14 +153,14 @@ namespace Avalonia.X11
} }
private static void StaticErrorHandler(IntPtr smcConn, bool swap, int offendingMinorOpcode, 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) GetInstance(smcConn)
?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values); ?.ErrorHandler(swap, offendingMinorOpcode, offendingSequence, errorClass, severity, values);
} }
// ReSharper disable UnusedParameter.Local // 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) int severity, IntPtr values)
{ {
Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this, Logger.TryGet(LogEventLevel.Warning, LogArea.X11Platform)?.Log(this,

Loading…
Cancel
Save