diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-25 08:29:35 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-25 08:29:51 -0400 |
| commit | f4387b437f6fc9dce864f5aa639bf1f5ddd98043 (patch) | |
| tree | 28a81b62a662ac53837946c4ab05cc5cb4a3c5b8 /include/wlr/interfaces | |
| parent | 61e451ea1b36435341d02ae34548bd0ea3abdd57 (diff) | |
| parent | 2330a6864373206a1359ec88bad2a8a714205e71 (diff) | |
Merge branch 'master' into rootston
Diffstat (limited to 'include/wlr/interfaces')
| -rw-r--r-- | include/wlr/interfaces/wlr_data_source.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_input_device.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_keyboard.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_pointer.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_tablet_pad.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_tablet_tool.h | 5 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_touch.h | 5 |
8 files changed, 24 insertions, 16 deletions
diff --git a/include/wlr/interfaces/wlr_data_source.h b/include/wlr/interfaces/wlr_data_source.h index 221c8007..821bdea0 100644 --- a/include/wlr/interfaces/wlr_data_source.h +++ b/include/wlr/interfaces/wlr_data_source.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_DATA_SOURCE_H -#define _WLR_INTERFACES_DATA_SOURCE_H +#ifndef WLR_INTERFACES_WLR_DATA_SOURCE_H +#define WLR_INTERFACES_WLR_DATA_SOURCE_H + #include <wlr/types/wlr_data_source.h> struct wlr_data_source_impl { diff --git a/include/wlr/interfaces/wlr_input_device.h b/include/wlr/interfaces/wlr_input_device.h index b236a24a..2a681ff8 100644 --- a/include/wlr/interfaces/wlr_input_device.h +++ b/include/wlr/interfaces/wlr_input_device.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_INPUT_DEVICE_H -#define _WLR_INTERFACES_INPUT_DEVICE_H +#ifndef WLR_INTERFACES_WLR_INPUT_DEVICE_H +#define WLR_INTERFACES_WLR_INPUT_DEVICE_H + #include <wlr/types/wlr_input_device.h> struct wlr_input_device_impl { diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h index ffa99b3b..78c1f753 100644 --- a/include/wlr/interfaces/wlr_keyboard.h +++ b/include/wlr/interfaces/wlr_keyboard.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACE_KEYBOARD_H -#define _WLR_INTERFACE_KEYBOARD_H +#ifndef WLR_INTERFACES_WLR_KEYBOARD_H +#define WLR_INTERFACES_WLR_KEYBOARD_H + #include <wlr/types/wlr_keyboard.h> #include <stdint.h> diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index a95fe588..7ed19ed9 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACE_OUTPUT_H -#define _WLR_INTERFACE_OUTPUT_H +#ifndef WLR_INTERFACES_WLR_OUTPUT_H +#define WLR_INTERFACES_WLR_OUTPUT_H + #include <wlr/types/wlr_output.h> #include <stdbool.h> diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h index 8d4bf703..af677b97 100644 --- a/include/wlr/interfaces/wlr_pointer.h +++ b/include/wlr/interfaces/wlr_pointer.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_POINTER_H -#define _WLR_INTERFACES_POINTER_H +#ifndef WLR_INTERFACES_WLR_POINTER_H +#define WLR_INTERFACES_WLR_POINTER_H + #include <wlr/types/wlr_pointer.h> struct wlr_pointer_impl { diff --git a/include/wlr/interfaces/wlr_tablet_pad.h b/include/wlr/interfaces/wlr_tablet_pad.h index 81af3c3f..5ec1e3eb 100644 --- a/include/wlr/interfaces/wlr_tablet_pad.h +++ b/include/wlr/interfaces/wlr_tablet_pad.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_TABLET_PAD_H -#define _WLR_INTERFACES_TABLET_PAD_H +#ifndef WLR_INTERFACES_WLR_TABLET_PAD_H +#define WLR_INTERFACES_WLR_TABLET_PAD_H + #include <wlr/types/wlr_tablet_pad.h> struct wlr_tablet_pad_impl { diff --git a/include/wlr/interfaces/wlr_tablet_tool.h b/include/wlr/interfaces/wlr_tablet_tool.h index 43a24fd0..347a0003 100644 --- a/include/wlr/interfaces/wlr_tablet_tool.h +++ b/include/wlr/interfaces/wlr_tablet_tool.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_TABLET_TOOL_H -#define _WLR_INTERFACES_TABLET_TOOL_H +#ifndef WLR_INTERFACES_WLR_TABLET_TOOL_H +#define WLR_INTERFACES_WLR_TABLET_TOOL_H + #include <wlr/types/wlr_tablet_tool.h> struct wlr_tablet_tool_impl { diff --git a/include/wlr/interfaces/wlr_touch.h b/include/wlr/interfaces/wlr_touch.h index b5fcef18..63bac6b8 100644 --- a/include/wlr/interfaces/wlr_touch.h +++ b/include/wlr/interfaces/wlr_touch.h @@ -1,5 +1,6 @@ -#ifndef _WLR_INTERFACES_TOUCH_H -#define _WLR_INTERFACES_TOUCH_H +#ifndef WLR_INTERFACES_WLR_TOUCH_H +#define WLR_INTERFACES_WLR_TOUCH_H + #include <wlr/types/wlr_touch.h> struct wlr_touch_impl { |