xserver: Branch 'master'

[GitLab Mirror]

 hw/xquartz/X11Application.m |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 279bcbd9cf9e557a6789d6e4cede8e8799c3788e
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Feb 18 12:43:53 2021 -0800

    xquartz: Silence a compiler warning about missing internal methods on NSApplication
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 7923c337b..af1ea5839 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -102,6 +102,11 @@ CFStringRef app_prefs_domain_cfstr = NULL;
 #define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | \
                        NSAlternateKeyMask | NSCommandKeyMask)
 
+ at interface NSApplication (Internal)
+- (void)_setKeyWindow:(id)window;
+- (void)_setMainWindow:(id)window;
+ at end
+
 @interface X11Application (Private)
 - (void) sendX11NSEvent:(NSEvent *)e;
 @end