Merge pull request #1153 from emersion/include-config

Always include config.h

backend/backend.c

@@ -13,10 +13,7 @@
 #include <wlr/backend/multi.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/wayland.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
-
-/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */
 #ifdef WLR_HAS_X11_BACKEND
 #include <wlr/backend/x11.h>
 #endif

backend/session/direct-ipc.c

@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
 #ifdef __linux__

backend/session/logind.c

@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <wayland-server.h>
 #include <wlr/backend/session/interface.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include "util/signal.h"
 

backend/session/session.c

@@ -9,7 +9,6 @@
 #include <wayland-server.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/session/interface.h>
-#include <wlr/config.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>

backend/x11/backend.c

@@ -7,7 +7,6 @@
 #include <wayland-server.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/x11.h>
-#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>

backend/x11/input_device.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <wlr/config.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_pointer.h>

meson.build

@@ -25,6 +25,10 @@ add_project_arguments(
 	'-I@0@'.format(meson.build_root()),
 	language: 'c',
 )
+add_project_arguments(
+	'-include@0@'.format(join_paths(meson.build_root(), 'include', 'wlr', 'config.h')),
+	language: 'c',
+)
 add_project_link_arguments(
 	'-Wl,-rpath,@0@'.format(meson.build_root()),
 	language: 'c',

types/tablet_v2/wlr_tablet_v2.c

@@ -8,7 +8,6 @@
 #include <string.h>
 #include <wayland-server.h>
 #include <types/wlr_tablet_v2.h>
-#include <wlr/config.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_tablet_tool.h>
 #include <wlr/types/wlr_tablet_v2.h>

xwayland/xwm.c

@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wlr/config.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/edges.h>
 #include <wlr/util/log.h>