diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2024-02-20 11:12:38 +1000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-02-23 23:11:01 +0000 |
| commit | eaa92ea4224e161075db3fef3fc12a5d3c72d020 (patch) | |
| tree | 69a10f09aea4746da5129098973732a20a5c9b44 /Xi | |
| parent | af9f70013abc4201c473da7485addc898da4d0da (diff) | |
Revert "include: move BUG_*() macros to separate header"
This breaks the xf86-input-synaptics driver:
synaptics.c: In function 'clickpad_guess_clickfingers':
synaptics.c:2638:5: error: implicit declaration of function 'BUG_RETURN_VAL' [-Werror=implicit-function-declaration]
2638 | BUG_RETURN_VAL(hw->num_mt_mask > sizeof(close_point) * 8, 0);
This reverts commit 442aec2219e0aba5482f96e1047748416237ffaa.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1316>
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/exevents.c | 2 | ||||
| -rw-r--r-- | Xi/xibarriers.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index cff5a2ae5..e16171468 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -89,8 +89,6 @@ SOFTWARE. #include <X11/extensions/XIproto.h> #include <X11/extensions/XI2proto.h> #include <X11/extensions/geproto.h> - -#include "bug.h" #include "windowstr.h" #include "miscstruct.h" #include "region.h" diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 7261964cb..1926762ad 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -45,7 +45,6 @@ #include <dix-config.h> #endif -#include "bug.h" #include "xibarriers.h" #include "scrnintstr.h" #include "cursorstr.h" |