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/backend | |
| parent | 61e451ea1b36435341d02ae34548bd0ea3abdd57 (diff) | |
| parent | 2330a6864373206a1359ec88bad2a8a714205e71 (diff) | |
Merge branch 'master' into rootston
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm-properties.h | 4 | ||||
| -rw-r--r-- | include/backend/drm-util.h | 4 | ||||
| -rw-r--r-- | include/backend/drm.h | 4 | ||||
| -rw-r--r-- | include/backend/libinput.h | 4 | ||||
| -rw-r--r-- | include/backend/multi.h | 4 | ||||
| -rw-r--r-- | include/backend/session/direct-ipc.h | 4 | ||||
| -rw-r--r-- | include/backend/wayland.h | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/include/backend/drm-properties.h b/include/backend/drm-properties.h index 7a061dd3..7de386ea 100644 --- a/include/backend/drm-properties.h +++ b/include/backend/drm-properties.h @@ -1,5 +1,5 @@ -#ifndef DRM_PROPERTIES_H -#define DRM_PROPERTIES_H +#ifndef BACKEND_DRM_PROPERTIES_H +#define BACKEND_DRM_PROPERTIES_H #include <stdbool.h> #include <stdint.h> diff --git a/include/backend/drm-util.h b/include/backend/drm-util.h index 9abee6ea..6818b4db 100644 --- a/include/backend/drm-util.h +++ b/include/backend/drm-util.h @@ -1,5 +1,5 @@ -#ifndef WLR_DRM_UTIL_H -#define WLR_DRM_UTIL_H +#ifndef BACKEND_DRM_UTIL_H +#define BACKEND_DRM_UTIL_H #include <stdint.h> #include <xf86drm.h> diff --git a/include/backend/drm.h b/include/backend/drm.h index 342a980c..122d49ef 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -1,5 +1,5 @@ -#ifndef DRM_BACKEND_H -#define DRM_BACKEND_H +#ifndef BACKEND_DRM_H +#define BACKEND_DRM_H #include <stdbool.h> #include <stddef.h> diff --git a/include/backend/libinput.h b/include/backend/libinput.h index f484ea8d..bb6083a4 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -1,5 +1,5 @@ -#ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H -#define _WLR_BACKEND_LIBINPUT_INTERNAL_H +#ifndef BACKEND_LIBINPUT_H +#define BACKEND_LIBINPUT_H #include <libinput.h> #include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/backend/multi.h b/include/backend/multi.h index c7a2198e..2c409b3a 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -1,5 +1,5 @@ -#ifndef _WLR_MULTI_BACKEND_INTERNAL -#define _WLR_MULTI_BACKEND_INTERNAL +#ifndef BACKEND_MULTI_H +#define BACKEND_MULTI_H #include <wlr/backend/interface.h> #include <wlr/backend/multi.h> diff --git a/include/backend/session/direct-ipc.h b/include/backend/session/direct-ipc.h index 2189d6fa..c660b58f 100644 --- a/include/backend/session/direct-ipc.h +++ b/include/backend/session/direct-ipc.h @@ -1,5 +1,5 @@ -#ifndef SESSION_DIRECT_IPC -#define SESSION_DIRECT_IPC +#ifndef BACKEND_SESSION_DIRECT_IPC_H +#define BACKEND_SESSION_DIRECT_IPC_H #include <sys/types.h> diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 42739c18..752dab69 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -1,5 +1,5 @@ -#ifndef _WLR_INTERNAL_BACKEND_WAYLAND_H -#define _WLR_INTERNAL_BACKEND_WAYLAND_H +#ifndef BACKEND_WAYLAND_H +#define BACKEND_WAYLAND_H #include <stdbool.h> #include <wayland-client.h> |