From 51bfdd620e70c41e1a9fb4ce7831eddfb1bf893b Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Nov 2018 10:12:46 +0100 Subject: Use #if instead of #ifdef for wlroots config data This prevents some annoying issues when e.g. not including wlr/config.h or making a typo in the guard name. --- backend/backend.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'backend/backend.c') diff --git a/backend/backend.c b/backend/backend.c index c5dcdb48..b369a135 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -17,8 +17,7 @@ #include #include "backend/multi.h" -/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */ -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND #include #endif @@ -102,7 +101,7 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display, return backend; } -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND static struct wlr_backend *attempt_x11_backend(struct wl_display *display, const char *x11_display, wlr_renderer_create_func_t create_renderer_func) { struct wlr_backend *backend = wlr_x11_backend_create(display, x11_display, create_renderer_func); @@ -165,7 +164,7 @@ static struct wlr_backend *attempt_backend_by_name(struct wl_display *display, const char *name, wlr_renderer_create_func_t create_renderer_func) { if (strcmp(name, "wayland") == 0) { return attempt_wl_backend(display, create_renderer_func); -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND } else if (strcmp(name, "x11") == 0) { return attempt_x11_backend(display, NULL, create_renderer_func); #endif @@ -248,7 +247,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display, } } -#ifdef WLR_HAS_X11_BACKEND +#if WLR_HAS_X11_BACKEND const char *x11_display = getenv("DISPLAY"); if (x11_display) { struct wlr_backend *x11_backend = -- cgit v1.2.3