From 491ba2669a50fd7c83c35bb774a9eaeb9dcba84d Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 15 Mar 2024 18:46:18 +0100 Subject: [PATCH] (submit/bsd-defines v2) xfree86: os-support: move CONSOLE_X_BELL into bsd_bell.c This define is only used inside bsd_bell.c, so move it there. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/os-support/bsd/bsd_bell.c | 4 ++++ hw/xfree86/os-support/xf86_OSlib.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c index 2b0bba2f6..1a60a8ad9 100644 --- a/hw/xfree86/os-support/bsd/bsd_bell.c +++ b/hw/xfree86/os-support/bsd/bsd_bell.c @@ -38,6 +38,10 @@ #include "xf86_os_support.h" #include "xf86_OSlib.h" +#ifndef CONSOLE_X_BELL +#define CONSOLE_X_BELL _IOW('t',123,int[2]) +#endif + void xf86OSRingBell(int loudness, int pitch, int duration) { diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index c33e7897e..3cbc19ff7 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -203,9 +203,6 @@ struct pcvtid { #ifndef CONSOLE_X_MODE_OFF #define CONSOLE_X_MODE_OFF _IO('t',122) #endif -#ifndef CONSOLE_X_BELL -#define CONSOLE_X_BELL _IOW('t',123,int[2]) -#endif #ifndef CONSOLE_X_TV_ON #define CONSOLE_X_TV_ON _IOW('t',155,int) #endif