diff options
author | Markus Ongyerth <ongy@ongy.net> | 2018-05-04 16:40:41 +0200 |
---|---|---|
committer | Markus Ongyerth <ongy@ongy.net> | 2018-07-14 09:40:39 +0200 |
commit | 599f84f736ef617374660c82acf52bff0e95c566 (patch) | |
tree | 6aa8817c542c0f2cf0e7311b2cc63fe4f4ae2a06 /backend/libinput | |
parent | 5c7a37f30922d973e176b0eec29bb5fddf241eee (diff) |
Fix borked rebase
Diffstat (limited to 'backend/libinput')
-rw-r--r-- | backend/libinput/tablet_pad.c | 2 | ||||
-rw-r--r-- | backend/libinput/tablet_tool.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c index 7c196bf1..bb65adf6 100644 --- a/backend/libinput/tablet_pad.c +++ b/backend/libinput/tablet_pad.c @@ -79,7 +79,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad, wl_list_insert(&pad->groups, &group->link); } -struct wlr_tablet_pad *libinput_tablet_pad_create( +struct wlr_tablet_pad *create_libinput_tablet_pad( struct libinput_device *libinput_dev) { assert(libinput_dev); struct wlr_tablet_pad *wlr_tablet_pad = calloc(1, sizeof(struct wlr_tablet_pad)); diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 3a39f5dc..a20637c1 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -74,7 +74,7 @@ void wlr_libinput_tablet_tool_destroy(struct wlr_input_device *wlr_dev) { } } -struct wlr_tablet_tool *libinput_tablet_tool_create( +struct wlr_tablet_tool *create_libinput_tablet_tool( struct libinput_device *libinput_dev) { assert(libinput_dev); struct wlr_libinput_tablet *libinput_tablet_tool = |