From 4c644fd792e642fc566f7b0b08bc000ecf641a50 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed, 18 Dec 2019 14:13:34 +0100
Subject: [PATCH] xwayland: Move Xwayland GLX declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the Xwayland GLX declaration to its own header file.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
---
 hw/xwayland/Makefile.am       |  1 +
 hw/xwayland/meson.build       |  1 +
 hw/xwayland/xwayland-glamor.c |  1 +
 hw/xwayland/xwayland-glx.h    | 37 +++++++++++++++++++++++++++++++++++
 hw/xwayland/xwayland.h        |  5 -----
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 hw/xwayland/xwayland-glx.h

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 5d6a2ab91..99e8a275b 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -16,6 +16,7 @@ Xwayland_SOURCES =				\
 	xwayland-cursor.c			\
 	xwayland-cursor.h			\
 	xwayland-glamor.h			\
+	xwayland-glx.h				\
 	xwayland-pixmap.c			\
 	xwayland-pixmap.h			\
 	xwayland-present.h			\
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 640af0634..b6d060363 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -5,6 +5,7 @@ srcs = [
     'xwayland-cursor.c',
     'xwayland-cursor.h',
     'xwayland-glamor.h',
+    'xwayland-glx.h',
     'xwayland-pixmap.c',
     'xwayland-pixmap.h',
     'xwayland-present.h',
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index e7c984c83..f18196cec 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -39,6 +39,7 @@
 
 #include "xwayland.h"
 #include "xwayland-glamor.h"
+#include "xwayland-glx.h"
 #include "xwayland-screen.h"
 #include "xwayland-window.h"
 
diff --git a/hw/xwayland/xwayland-glx.h b/hw/xwayland/xwayland-glx.h
new file mode 100644
index 000000000..62c9fb7ce
--- /dev/null
+++ b/hw/xwayland/xwayland-glx.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2019 Red Hat, Inc.
+ *
+ * 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 (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ *	Adam Jackson <ajax@redhat.com>
+ */
+
+#ifndef XWAYLAND_GLX_H
+#define XWAYLAND_GLX_H
+
+#include <xwayland-config.h>
+
+#ifdef GLXEXT
+#include "glx_extinit.h"
+extern __GLXprovider glamor_provider;
+#endif
+
+#endif /* XWAYLAND_GLX_H */
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
index 187af6697..81cd120cd 100644
--- a/hw/xwayland/xwayland.h
+++ b/hw/xwayland/xwayland.h
@@ -50,9 +50,4 @@
 
 #define MODIFIER_META 0x01
 
-#ifdef GLXEXT
-#include "glx_extinit.h"
-extern __GLXprovider glamor_provider;
-#endif
-
 #endif