From aa1ec33ec8e8cf1a3ababc8e64a4a93b6084661e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 15 Mar 2024 18:51:57 +0100 Subject: [PATCH] (submit/bsd-defines v2) xfree86: os-support: move CONSOLE_X_TV_ON/OFF to i386_video.c These are only used in i386_video.c, so move them there. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/os-support/bsd/i386_video.c | 8 ++++++++ hw/xfree86/os-support/xf86_OSlib.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 403aa08cc..3a5b354ae 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -42,6 +42,14 @@ #define MAP_FLAGS (MAP_FILE | MAP_SHARED) #endif +#ifndef CONSOLE_X_TV_ON +#define CONSOLE_X_TV_ON _IOW('t',155,int) +#endif + +#ifndef CONSOLE_X_TV_OFF +#define CONSOLE_X_TV_OFF _IO('t',156) +#endif + #ifdef __OpenBSD__ #define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\ "\tin /etc/sysctl.conf and reboot your machine\n" \ diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 10237c12f..855fab686 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -211,13 +211,6 @@ struct pcvtid { #endif /* WSCONS_SUPPORT */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include -#endif - /* Include these definitions in case ioctl_pc.h didn't get included */ -#ifndef CONSOLE_X_TV_ON -#define CONSOLE_X_TV_ON _IOW('t',155,int) -#endif -#ifndef CONSOLE_X_TV_OFF -#define CONSOLE_X_TV_OFF _IO('t',156) #endif #if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)