From 427bdb5b558b995e556ed3e708dfbe91f257d091 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 23 Sep 2017 10:26:01 +0200 Subject: Use more consistent include guard names --- include/wlr/backend.h | 4 ++-- include/wlr/backend/interface.h | 4 ++-- include/wlr/backend/multi.h | 4 ++-- include/wlr/backend/session.h | 4 ++-- include/wlr/backend/session/interface.h | 4 ++-- include/wlr/interfaces/wlr_data_source.h | 5 +++-- include/wlr/interfaces/wlr_input_device.h | 5 +++-- include/wlr/interfaces/wlr_keyboard.h | 5 +++-- include/wlr/interfaces/wlr_output.h | 5 +++-- include/wlr/interfaces/wlr_pointer.h | 5 +++-- include/wlr/interfaces/wlr_tablet_pad.h | 5 +++-- include/wlr/interfaces/wlr_tablet_tool.h | 5 +++-- include/wlr/interfaces/wlr_touch.h | 5 +++-- include/wlr/render.h | 5 +++-- include/wlr/render/gles2.h | 5 +++-- include/wlr/render/interface.h | 5 +++-- include/wlr/render/matrix.h | 4 ++-- include/wlr/types/wlr_box.h | 5 +++-- include/wlr/types/wlr_compositor.h | 6 ++++-- include/wlr/types/wlr_cursor.h | 5 +++-- include/wlr/types/wlr_data_device_manager.h | 4 ++-- include/wlr/types/wlr_data_source.h | 4 ++-- include/wlr/types/wlr_gamma_control.h | 5 +++-- include/wlr/types/wlr_input_device.h | 4 ++-- include/wlr/types/wlr_keyboard.h | 5 +++-- include/wlr/types/wlr_output.h | 5 +++-- include/wlr/types/wlr_output_layout.h | 5 +++-- include/wlr/types/wlr_pointer.h | 5 +++-- include/wlr/types/wlr_region.h | 4 ++-- include/wlr/types/wlr_seat.h | 5 +++-- include/wlr/types/wlr_surface.h | 5 +++-- include/wlr/types/wlr_tablet_pad.h | 5 +++-- include/wlr/types/wlr_tablet_tool.h | 5 +++-- include/wlr/types/wlr_touch.h | 5 +++-- include/wlr/types/wlr_wl_shell.h | 5 +++-- include/wlr/types/wlr_xdg_shell_v6.h | 5 +++-- include/wlr/util/list.h | 4 ++-- include/wlr/util/log.h | 5 +++-- include/wlr/xcursor.h | 6 ++++-- include/wlr/xwayland.h | 5 +++-- 40 files changed, 111 insertions(+), 80 deletions(-) (limited to 'include/wlr') diff --git a/include/wlr/backend.h b/include/wlr/backend.h index f92857eb..6c11152f 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -1,5 +1,5 @@ -#ifndef _WLR_BACKEND_H -#define _WLR_BACKEND_H +#ifndef WLR_BACKEND_H +#define WLR_BACKEND_H #include #include diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h index b0814da5..ea41400a 100644 --- a/include/wlr/backend/interface.h +++ b/include/wlr/backend/interface.h @@ -1,5 +1,5 @@ -#ifndef _WLR_BACKEND_INTERFACE_H -#define _WLR_BACKEND_INTERFACE_H +#ifndef WLR_BACKEND_INTERFACE_H +#define WLR_BACKEND_INTERFACE_H #include #include diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index 3fcaaf1e..5559f2c1 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -1,5 +1,5 @@ -#ifndef _WLR_BACKEND_MULTI_H -#define _WLR_BACKEND_MULTI_H +#ifndef WLR_BACKEND_MULTI_H +#define WLR_BACKEND_MULTI_H #include #include diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h index 04e701b0..52cf13b7 100644 --- a/include/wlr/backend/session.h +++ b/include/wlr/backend/session.h @@ -1,5 +1,5 @@ -#ifndef WLR_SESSION_H -#define WLR_SESSION_H +#ifndef WLR_BACKEND_SESSION_H +#define WLR_BACKEND_SESSION_H #include #include diff --git a/include/wlr/backend/session/interface.h b/include/wlr/backend/session/interface.h index 1a029c54..b35ed71d 100644 --- a/include/wlr/backend/session/interface.h +++ b/include/wlr/backend/session/interface.h @@ -1,5 +1,5 @@ -#ifndef WLR_SESSION_INTERFACE_H -#define WLR_SESSION_INTERFACE_H +#ifndef WLR_BACKEND_SESSION_INTERFACE_H +#define WLR_BACKEND_SESSION_INTERFACE_H #include 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 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 struct wlr_input_device_impl { diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h index 779b302f..6fbb3f68 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_INTERFACE_WLR_KEYBOARD_H +#define WLR_INTERFACE_WLR_KEYBOARD_H + #include #include diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index a95fe588..15a3a619 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_INTERFACE_WLR_OUTPUT_H +#define WLR_INTERFACE_WLR_OUTPUT_H + #include #include 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 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 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 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 struct wlr_touch_impl { diff --git a/include/wlr/render.h b/include/wlr/render.h index b7924928..325f8c01 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -1,5 +1,6 @@ -#ifndef _WLR_RENDER_H -#define _WLR_RENDER_H +#ifndef WLR_RENDER_H +#define WLR_RENDER_H + #include #include #include diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index 4a944eb7..25e760d5 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -1,5 +1,6 @@ -#ifndef _WLR_GLES2_RENDERER_H -#define _WLR_GLES2_RENDERER_H +#ifndef WLR_RENDER_GLES2_H +#define WLR_RENDER_GLES2_H + #include #include diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index c00e0701..e3ba0414 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -1,5 +1,6 @@ -#ifndef _WLR_RENDER_INTERFACE_H -#define _WLR_RENDER_INTERFACE_H +#ifndef WLR_RENDER_INTERFACE_H +#define WLR_RENDER_INTERFACE_H + #include #include #include diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 789f7341..177af4b3 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -1,5 +1,5 @@ -#ifndef _WLR_RENDER_MATRIX_H -#define _WLR_RENDER_MATRIX_H +#ifndef WLR_RENDER_MATRIX_H +#define WLR_RENDER_MATRIX_H #include diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h index e2b1ab4e..5b8b00c9 100644 --- a/include/wlr/types/wlr_box.h +++ b/include/wlr/types/wlr_box.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_GEOMETRY_H -#define _WLR_TYPES_GEOMETRY_H +#ifndef WLR_TYPES_WLR_BOX_H +#define WLR_TYPES_WLR_BOX_H + #include struct wlr_box { diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 58a93760..b2f5a972 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -1,5 +1,6 @@ -#ifndef _EXAMPLE_COMPOSITOR_H -#define _EXAMPLE_COMPOSITOR_H +#ifndef WLR_TYPES_WLR_COMPOSITOR_H +#define WLR_TYPES_WLR_COMPOSITOR_H + #include #include @@ -22,4 +23,5 @@ struct wlr_compositor *wlr_compositor_create(struct wl_display *display, struct wlr_surface; void wl_compositor_surface_destroyed(struct wlr_compositor *wlr_compositor, struct wlr_surface *surface); + #endif diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h index 88390e0d..e8c13b1d 100644 --- a/include/wlr/types/wlr_cursor.h +++ b/include/wlr/types/wlr_cursor.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_CURSOR_H -#define _WLR_TYPES_CURSOR_H +#ifndef WLR_TYPES_WLR_CURSOR_H +#define WLR_TYPES_WLR_CURSOR_H + #include #include #include diff --git a/include/wlr/types/wlr_data_device_manager.h b/include/wlr/types/wlr_data_device_manager.h index d7ae46c8..500f8acd 100644 --- a/include/wlr/types/wlr_data_device_manager.h +++ b/include/wlr/types/wlr_data_device_manager.h @@ -1,5 +1,5 @@ -#ifndef _WLR_TYPES_DATA_DEVICE_MANAGER_H -#define _WLR_TYPES_DATA_DEVICE_MANAGER_H +#ifndef WLR_TYPES_WLR_DATA_DEVICE_MANAGER_H +#define WLR_TYPES_WLR_DATA_DEVICE_MANAGER_H #include diff --git a/include/wlr/types/wlr_data_source.h b/include/wlr/types/wlr_data_source.h index 63b0fe2a..19834cb6 100644 --- a/include/wlr/types/wlr_data_source.h +++ b/include/wlr/types/wlr_data_source.h @@ -1,5 +1,5 @@ -#ifndef _WLR_TYPES_DATA_SOURCE_H -#define _WLR_TYPES_DATA_SOURCE_H +#ifndef WLR_TYPES_WLR_DATA_SOURCE_H +#define WLR_TYPES_WLR_DATA_SOURCE_H #include #include diff --git a/include/wlr/types/wlr_gamma_control.h b/include/wlr/types/wlr_gamma_control.h index 259c6474..96c9f545 100644 --- a/include/wlr/types/wlr_gamma_control.h +++ b/include/wlr/types/wlr_gamma_control.h @@ -1,5 +1,6 @@ -#ifndef _WLR_GAMMA_CONTROL_H -#define _WLR_GAMMA_CONTROL_H +#ifndef WLR_TYPES_WLR_GAMMA_CONTROL_H +#define WLR_TYPES_WLR_GAMMA_CONTROL_H + #include struct wlr_gamma_control_manager { diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 5a41ce9d..50b0fb88 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -1,5 +1,5 @@ -#ifndef _WLR_TYPES_INPUT_H -#define _WLR_TYPES_INPUT_H +#ifndef WLR_TYPES_WLR_INPUT_DEVICE_H +#define WLR_TYPES_WLR_INPUT_DEVICE_H enum wlr_button_state { WLR_BUTTON_RELEASED, diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h index ce7d6659..3f5d0d0c 100644 --- a/include/wlr/types/wlr_keyboard.h +++ b/include/wlr/types/wlr_keyboard.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_KEYBOARD_H -#define _WLR_TYPES_KEYBOARD_H +#ifndef WLR_TYPES_WLR_KEYBOARD_H +#define WLR_TYPES_WLR_KEYBOARD_H + #include #include diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index b70bd19e..3208acac 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_OUTPUT_H -#define _WLR_TYPES_OUTPUT_H +#ifndef WLR_TYPES_WLR_OUTPUT_H +#define WLR_TYPES_WLR_OUTPUT_H + #include #include #include diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index 1f4a96d5..fe09106f 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_OUTPUT_LAYOUT_H -#define _WLR_TYPES_OUTPUT_LAYOUT_H +#ifndef WLR_TYPES_WLR_OUTPUT_LAYOUT_H +#define WLR_TYPES_WLR_OUTPUT_LAYOUT_H + #include #include #include diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 9153963a..a59d8817 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_POINTER_H -#define _WLR_TYPES_POINTER_H +#ifndef WLR_TYPES_WLR_POINTER_H +#define WLR_TYPES_WLR_POINTER_H + #include #include #include diff --git a/include/wlr/types/wlr_region.h b/include/wlr/types/wlr_region.h index 9a64ac13..6d59ee5e 100644 --- a/include/wlr/types/wlr_region.h +++ b/include/wlr/types/wlr_region.h @@ -1,5 +1,5 @@ -#ifndef _WLR_TYPES_REGION_H -#define _WLR_TYPES_REGION_H +#ifndef WLR_TYPES_WLR_REGION_H +#define WLR_TYPES_WLR_REGION_H struct wl_resource; diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index aa17d650..e7bd82fb 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_SEAT_H -#define _WLR_TYPES_SEAT_H +#ifndef WLR_TYPES_WLR_SEAT_H +#define WLR_TYPES_WLR_SEAT_H + #include #include #include diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 5fb648be..87d421e3 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_WLR_SURFACE_H -#define _WLR_TYPES_WLR_SURFACE_H +#ifndef WLR_TYPES_WLR_SURFACE_H +#define WLR_TYPES_WLR_SURFACE_H + #include #include #include diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h index 6c14c669..b747e6f1 100644 --- a/include/wlr/types/wlr_tablet_pad.h +++ b/include/wlr/types/wlr_tablet_pad.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_TABLET_PAD_H -#define _WLR_TYPES_TABLET_PAD_H +#ifndef WLR_TYPES_WLR_TABLET_PAD_H +#define WLR_TYPES_WLR_TABLET_PAD_H + #include #include #include diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index 9090828a..f04dfe15 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_TABLET_TOOL_H -#define _WLR_TYPES_TABLET_TOOL_H +#ifndef WLR_TYPES_TABLET_TOOL_H +#define WLR_TYPES_TABLET_TOOL_H + #include #include #include diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index 1a27cad3..f1165c87 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -1,5 +1,6 @@ -#ifndef _WLR_TYPES_TOUCH_H -#define _WLR_TYPES_TOUCH_H +#ifndef WLR_TYPES_WLR_TOUCH_H +#define WLR_TYPES_WLR_TOUCH_H + #include #include diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index a085711b..1443bbf0 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -1,5 +1,6 @@ -#ifndef _WLR_WL_SHELL_H -#define _WLR_WL_SHELL_H +#ifndef WLR_TYPES_WLR_WL_SHELL_H +#define WLR_TYPES_WLR_WL_SHELL_H + #include struct wlr_wl_shell { diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 786bf4e6..cc52d9c7 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -1,5 +1,6 @@ -#ifndef _WLR_XDG_SHELL_V6_H -#define _WLR_XDG_SHELL_V6_H +#ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H +#define WLR_TYPES_WLR_XDG_SHELL_V6_H + #include #include diff --git a/include/wlr/util/list.h b/include/wlr/util/list.h index 6e746ec4..02039d89 100644 --- a/include/wlr/util/list.h +++ b/include/wlr/util/list.h @@ -1,5 +1,5 @@ -#ifndef _WLR_UTIL_LIST_H -#define _WLR_UTIL_LIST_H +#ifndef WLR_UTIL_LIST_H +#define WLR_UTIL_LIST_H #include diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h index 2acaa2ed..3de2cacf 100644 --- a/include/wlr/util/log.h +++ b/include/wlr/util/log.h @@ -1,5 +1,6 @@ -#ifndef _WLR_UTIL_LOG_H -#define _WLR_UTIL_LOG_H +#ifndef WLR_UTIL_LOG_H +#define WLR_UTIL_LOG_H + #include #include #include diff --git a/include/wlr/xcursor.h b/include/wlr/xcursor.h index ae07b4fa..c12d5405 100644 --- a/include/wlr/xcursor.h +++ b/include/wlr/xcursor.h @@ -27,8 +27,10 @@ * This is adapted from wayland-cursor, but with the wl_shm client stuff removed * so we can use it on the compositor, too. */ -#ifndef _WLR_XCURSOR_H -#define _WLR_XCURSOR_H + +#ifndef WLR_XCURSOR_H +#define WLR_XCURSOR_H + #include struct wlr_xcursor_image { diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index a0fb34ce..41b8042f 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -1,5 +1,6 @@ -#ifndef _WLR_XWAYLAND_H -#define _WLR_XWAYLAND_H +#ifndef WLR_XWAYLAND_H +#define WLR_XWAYLAND_H + #include #include #include -- cgit v1.2.3