From 758bee502d215d5f1d79a651fe2315884a44134c Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 15 Mar 2024 18:47:12 +0100
Subject: [PATCH] xfree86: os-support: move CONSOLE_X_MODE_ON/OFF to bsd_init.c

These are only used in bsd_init.c, so move them there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
---
 hw/xfree86/os-support/bsd/bsd_init.c | 8 ++++++++
 hw/xfree86/os-support/xf86_OSlib.h   | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 2ef34ba29..5c1323e1a 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -45,6 +45,14 @@
 
 #include "os/osdep.h"
 
+#ifndef CONSOLE_X_MODE_ON
+#define CONSOLE_X_MODE_ON _IO('t',121)
+#endif
+
+#ifndef CONSOLE_X_MODE_OFF
+#define CONSOLE_X_MODE_OFF _IO('t',122)
+#endif
+
 static Bool KeepTty = FALSE;
 
 #ifdef PCCONS_SUPPORT
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 3cbc19ff7..b87dc8463 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -197,12 +197,6 @@ struct pcvtid {
 #include <sys/mouse.h>
 #endif
     /* Include these definitions in case ioctl_pc.h didn't get included */
-#ifndef CONSOLE_X_MODE_ON
-#define CONSOLE_X_MODE_ON _IO('t',121)
-#endif
-#ifndef CONSOLE_X_MODE_OFF
-#define CONSOLE_X_MODE_OFF _IO('t',122)
-#endif
 #ifndef CONSOLE_X_TV_ON
 #define CONSOLE_X_TV_ON _IOW('t',155,int)
 #endif