xwayland: Move Xwayland vidmode declaration

Move the Xwayland vidmode declaration to its own header file.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

6 files changed, 41 insertions, 4 deletions

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index a7dc78389..5d6a2ab91 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -29,6 +29,7 @@ Xwayland_SOURCES =				\
 	xwayland-cvt.c				\
 	xwayland-cvt.h				\
 	xwayland-vidmode.c			\
+	xwayland-vidmode.h			\
 	xwayland-window.c			\
 	xwayland-window.h			\
 	xwayland-window-buffers.c		\
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index e6da62a88..640af0634 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -18,6 +18,7 @@ srcs = [
     'xwayland-cvt.c',
     'xwayland-cvt.h',
     'xwayland-vidmode.c',
+    'xwayland-vidmode.h',
     'xwayland-window.c',
     'xwayland-window.h',
     'xwayland-window-buffers.c',
diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c
index 8ff68ba53..137200250 100644
--- a/hw/xwayland/xwayland-vidmode.c
+++ b/hw/xwayland/xwayland-vidmode.c
@@ -40,6 +40,7 @@
 #include "vidmodestr.h"
 
 #include "xwayland-screen.h"
+#include "xwayland-vidmode.h"
 
 static DevPrivateKeyRec xwlVidModePrivateKeyRec;
 #define xwlVidModePrivateKey (&xwlVidModePrivateKeyRec)
diff --git a/hw/xwayland/xwayland-vidmode.h b/hw/xwayland/xwayland-vidmode.h
new file mode 100644
index 000000000..4e3236eb1
--- /dev/null
+++ b/hw/xwayland/xwayland-vidmode.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifndef XWAYLAND_VIDMODE_H
+#define XWAYLAND_VIDMODE_H
+
+#include <xwayland-config.h>
+
+#ifdef XF86VIDMODE
+void xwlVidModeExtensionInit(void);
+#endif
+
+#endif /* XWAYLAND_VIDMODE_H */
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index d45caffbe..ff85ebbd8 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -38,6 +38,7 @@
 
 #include "xwayland.h"
 #include "xwayland-screen.h"
+#include "xwayland-vidmode.h"
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
index bee09330a..187af6697 100644
--- a/hw/xwayland/xwayland.h
+++ b/hw/xwayland/xwayland.h
@@ -50,10 +50,6 @@
 
 #define MODIFIER_META 0x01
 
-#ifdef XF86VIDMODE
-void xwlVidModeExtensionInit(void);
-#endif
-
 #ifdef GLXEXT
 #include "glx_extinit.h"
 extern __GLXprovider glamor_provider;