From 427bdb5b558b995e556ed3e708dfbe91f257d091 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 23 Sep 2017 10:26:01 +0200
Subject: Use more consistent include guard names

---
 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 +++--
 8 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'include/wlr/interfaces')

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 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 <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..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 <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 {
-- 
cgit v1.2.3


From 4809b7b3e44e8e3ce6a5cc38294f5796baec8166 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 23 Sep 2017 13:10:10 +0200
Subject: Fix some include guard names in interfaces/

---
 include/wlr/interfaces/wlr_keyboard.h | 4 ++--
 include/wlr/interfaces/wlr_output.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/wlr/interfaces')

diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h
index 6fbb3f68..4958e2b8 100644
--- a/include/wlr/interfaces/wlr_keyboard.h
+++ b/include/wlr/interfaces/wlr_keyboard.h
@@ -1,5 +1,5 @@
-#ifndef WLR_INTERFACE_WLR_KEYBOARD_H
-#define WLR_INTERFACE_WLR_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 15a3a619..7ed19ed9 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -1,5 +1,5 @@
-#ifndef WLR_INTERFACE_WLR_OUTPUT_H
-#define WLR_INTERFACE_WLR_OUTPUT_H
+#ifndef WLR_INTERFACES_WLR_OUTPUT_H
+#define WLR_INTERFACES_WLR_OUTPUT_H
 
 #include <wlr/types/wlr_output.h>
 #include <stdbool.h>
-- 
cgit v1.2.3