diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-11-21 07:55:36 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-11-21 07:55:36 -0500 |
| commit | e786d17f632377b6875c812d67165bcddb0a4826 (patch) | |
| tree | f447fedce70e3b97778990726fc99b73c58fe885 /include/backend | |
| parent | 444257b6b17935be5dff11791e9ac9d52cf811b7 (diff) | |
| parent | 6bde8dd56beebc429445196d7d4a120677289317 (diff) | |
| download | wlroots-e786d17f632377b6875c812d67165bcddb0a4826.tar.xz | |
Merge branch 'master' into feature/xwm-selection
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm/drm.h | 1 | ||||
| -rw-r--r-- | include/backend/libinput.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index e08965e5..4fad9678 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -14,7 +14,6 @@ #include <wlr/backend/drm.h> #include <wlr/types/wlr_output.h> #include <wlr/render/egl.h> -#include <wlr/types/wlr_list.h> #include "iface.h" #include "properties.h" diff --git a/include/backend/libinput.h b/include/backend/libinput.h index 93b859a7..be2557ed 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -18,7 +18,7 @@ struct wlr_libinput_backend { struct wl_listener session_signal; - struct wlr_list *wlr_device_lists; + struct wlr_list wlr_device_lists; // list of struct wl_list }; struct wlr_libinput_input_device { |