summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-02-18 14:47:50 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-02-18 22:32:14 -0800
commitf51b97b0de2e562e341f2d72c5f00a74c71a159f (patch)
tree5a68aa1e6892f4230f32f456398acee94c141cb6
parent4b4500c48f06e7ef41cd94f417e49b3f4f1412ae (diff)
xquartz: Fold quartzCommon.h into quartz.h
Everything declared in it comes from quartz.c, so match reality. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/Makefile.am1
-rw-r--r--hw/xquartz/X11Application.h2
-rw-r--r--hw/xquartz/X11Application.m2
-rw-r--r--hw/xquartz/X11Controller.m2
-rw-r--r--hw/xquartz/applewm.c2
-rw-r--r--hw/xquartz/quartz.c1
-rw-r--r--hw/xquartz/quartz.h11
-rw-r--r--hw/xquartz/quartzCommon.h49
-rw-r--r--hw/xquartz/quartzRandR.c1
-rw-r--r--hw/xquartz/quartzStartup.c1
-rw-r--r--hw/xquartz/xpr/xprScreen.c1
11 files changed, 14 insertions, 59 deletions
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index c238fe909..342a998b2 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -45,7 +45,6 @@ EXTRA_DIST = \
darwinEvents.h \
keysym2ucs.h \
quartz.h \
- quartzCommon.h \
quartzKeyboard.h \
quartzRandR.h \
sanitizedCarbon.h \
diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index b10d265f9..d636a3a69 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -31,6 +31,8 @@
#ifndef X11APPLICATION_H
#define X11APPLICATION_H 1
+#include <X11/Xdefs.h>
+
#if __OBJC__
#import "X11Controller.h"
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 0574f908a..67c638b6d 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -34,8 +34,6 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
-
#import "X11Application.h"
#include "darwin.h"
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index abef8156a..d489dde5d 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -34,8 +34,6 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
-
#import "X11Controller.h"
#import "X11Application.h"
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index cc91c9608..e743a861e 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -34,7 +34,7 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
+#include "quartz.h"
#include "misc.h"
#include "dixstruct.h"
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 477a85f96..233570a75 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -35,7 +35,6 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
#include "quartzRandR.h"
#include "inputstr.h"
#include "quartz.h"
diff --git a/hw/xquartz/quartz.h b/hw/xquartz/quartz.h
index ddbf2e780..3a456f573 100644
--- a/hw/xquartz/quartz.h
+++ b/hw/xquartz/quartz.h
@@ -34,6 +34,9 @@
#ifndef _QUARTZ_H
#define _QUARTZ_H
+#include <X11/Xdefs.h>
+#include "privates.h"
+
#include "screenint.h"
#include "window.h"
#include "pixmap.h"
@@ -127,6 +130,14 @@ extern Bool XQuartzOptionSendsAlt; /* Alt or Mode_switch? */
extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */
+// Other shared data
+extern DevPrivateKeyRec quartzScreenKeyRec;
+#define quartzScreenKey (&quartzScreenKeyRec)
+extern int aquaMenuBarHeight;
+
+// Name of GLX bundle for native OpenGL
+extern const char *quartzOpenGLBundle;
+
Bool
QuartzAddScreen(int index, ScreenPtr pScreen);
Bool
diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
deleted file mode 100644
index 13fbe55d8..000000000
--- a/hw/xquartz/quartzCommon.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * quartzCommon.h
- *
- * Common definitions used internally by all Quartz modes
- *
- * This file should be included before any X11 or IOKit headers
- * so that it can avoid symbol conflicts.
- *
- * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifndef _QUARTZCOMMON_H
-#define _QUARTZCOMMON_H
-
-#include <X11/Xdefs.h>
-#include "privates.h"
-
-// Other shared data
-extern DevPrivateKeyRec quartzScreenKeyRec;
-#define quartzScreenKey (&quartzScreenKeyRec)
-extern int aquaMenuBarHeight;
-
-// Name of GLX bundle for native OpenGL
-extern const char *quartzOpenGLBundle;
-
-#endif /* _QUARTZCOMMON_H */
diff --git a/hw/xquartz/quartzRandR.c b/hw/xquartz/quartzRandR.c
index 795d1915c..3ecc0e771 100644
--- a/hw/xquartz/quartzRandR.c
+++ b/hw/xquartz/quartzRandR.c
@@ -35,7 +35,6 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
#include "quartzRandR.h"
#include "quartz.h"
#include "darwin.h"
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index bb92b6d3c..732eba983 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -36,7 +36,6 @@
#include <fcntl.h>
#include <unistd.h>
#include <CoreFoundation/CoreFoundation.h>
-#include "quartzCommon.h"
#include "X11Controller.h"
#include "darwin.h"
#include "darwinEvents.h"
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index ec2cdaa0c..270d6eb00 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -33,7 +33,6 @@
#include <dix-config.h>
#endif
-#include "quartzCommon.h"
#include "inputstr.h"
#include "quartz.h"
#include "quartzRandR.h"