frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "xfree86: os-support: move CONSOLE_X_BELL into bsd_bell.c" 

This reverts commit 8958a99c02.
It broke the build of the xf86-input-keyboard driver, which relies
on CONSOLE_X_BELL in src/bsd_kbd.c.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1741>
This commit is contained in:
Alan Coopersmith 2024-11-13 16:47:52 -08:00
parent 5268fbd7cf
commit cac0d08102
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/os-support/bsd/bsd_bell.c
View File

@ -38,10 +38,6 @@
#include "xf86_os_support.h" #include "xf86_os_support.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#ifndef CONSOLE_X_BELL
#define CONSOLE_X_BELL _IOW('t',123,int[2])
#endif
void void
xf86OSRingBell(int loudness, int pitch, int duration) xf86OSRingBell(int loudness, int pitch, int duration)
{ {

4
hw/xfree86/os-support/xf86_OSlib.h
View File

@ -195,6 +195,10 @@ struct pcvtid {
#endif /* WSCONS_SUPPORT */ #endif /* WSCONS_SUPPORT */
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <sys/mouse.h> #include <sys/mouse.h>
#endif
/* Include these definitions in case ioctl_pc.h didn't get included */
#ifndef CONSOLE_X_BELL
#define CONSOLE_X_BELL _IOW('t',123,int[2])
#endif #endif
#define CLEARDTR_SUPPORT #define CLEARDTR_SUPPORT