aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/backend/libinput.h2
-rw-r--r--include/backend/x11.h4
-rw-r--r--include/meson.build2
-rw-r--r--include/xwayland/xwm.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 36c4794b..d469eb7c 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -72,7 +72,7 @@ void handle_pointer_button(struct libinput_event *event,
struct wlr_pointer *pointer);
void handle_pointer_axis(struct libinput_event *event,
struct wlr_pointer *pointer);
-#if LIBINPUT_HAS_SCROLL_VALUE120
+#if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wlr_axis_source source);
#endif
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 704d48f1..f66fed2a 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -19,7 +19,7 @@
#include "config.h"
-#if HAS_XCB_ERRORS
+#if HAVE_XCB_ERRORS
#include <xcb/xcb_errors.h>
#endif
@@ -99,7 +99,7 @@ struct wlr_x11_backend {
// The time we last received an event
xcb_timestamp_t time;
-#if HAS_XCB_ERRORS
+#if HAVE_XCB_ERRORS
xcb_errors_context_t *errors_context;
#endif
diff --git a/include/meson.build b/include/meson.build
index f97e76ac..e6698003 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -30,7 +30,7 @@ install_subdir('wlr',
)
foreach name, have : internal_features
- internal_config.set10('HAS_' + name.underscorify().to_upper(), have)
+ internal_config.set10('HAVE_' + name.underscorify().to_upper(), have)
endforeach
wlr_files += configure_file(
output: 'config.h',
diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h
index 7ed97b15..c057e1b7 100644
--- a/include/xwayland/xwm.h
+++ b/include/xwayland/xwm.h
@@ -8,7 +8,7 @@
#include "config.h"
#include "xwayland/selection.h"
-#if HAS_XCB_ERRORS
+#if HAVE_XCB_ERRORS
#include <xcb/xcb_errors.h>
#endif
@@ -126,7 +126,7 @@ struct wlr_xwm {
const xcb_query_extension_reply_t *xfixes;
const xcb_query_extension_reply_t *xres;
uint32_t xfixes_major_version;
-#if HAS_XCB_ERRORS
+#if HAVE_XCB_ERRORS
xcb_errors_context_t *errors_context;
#endif
unsigned int last_focus_seq;