aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-05-31 16:24:32 -0400
committerDrew DeVault <sir@cmpwn.com>2017-05-31 16:24:32 -0400
commite2ee67125e076af9be1f115051c680f6e3b69be5 (patch)
tree6031b58a5fa077829f07b86d05d54a461a724f27
parentc7f6981d9cdbdb27c415071487ad7974e5b1a94a (diff)
s/wayland.h/types.h/g
-rw-r--r--backend/drm/backend.c2
-rw-r--r--backend/drm/drm.c2
-rw-r--r--example/main.c2
-rw-r--r--include/types.h (renamed from include/wayland.h)2
-rw-r--r--include/wlr/types.h (renamed from include/wlr/wayland.h)0
-rw-r--r--types/wlr_output.c6
6 files changed, 7 insertions, 7 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 39f29da5..a7e736bb 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -6,7 +6,7 @@
#include <wayland-server.h>
#include <wlr/session.h>
-#include <wlr/wayland.h>
+#include <wlr/types.h>
#include <wlr/common/list.h>
#include "backend.h"
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 088539c8..fa91745f 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -13,7 +13,7 @@
#include <GLES3/gl3.h>
#include <wayland-server.h>
-#include "wayland.h"
+#include "types.h"
#include "backend.h"
#include "backend/drm/backend.h"
#include "backend/drm/drm.h"
diff --git a/example/main.c b/example/main.c
index 33e77f5e..ae602903 100644
--- a/example/main.c
+++ b/example/main.c
@@ -6,7 +6,7 @@
#include <GLES3/gl3.h>
#include <wlr/backend.h>
#include <wlr/session.h>
-#include <wlr/wayland.h>
+#include <wlr/types.h>
#include <wlr/common/list.h>
struct state {
diff --git a/include/wayland.h b/include/types.h
index ca79fe33..5513e936 100644
--- a/include/wayland.h
+++ b/include/types.h
@@ -2,7 +2,7 @@
#define _WLR_WAYLAND_INTERNAL_H
#include <wayland-server.h>
-#include <wlr/wayland.h>
+#include <wlr/types.h>
#include <stdbool.h>
struct wlr_output_impl {
diff --git a/include/wlr/wayland.h b/include/wlr/types.h
index 4870b84c..4870b84c 100644
--- a/include/wlr/wayland.h
+++ b/include/wlr/types.h
diff --git a/types/wlr_output.c b/types/wlr_output.c
index b424aaaf..826404a1 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -1,8 +1,8 @@
#include <stdlib.h>
#include <wayland-server.h>
-#include "wlr/wayland.h"
-#include "wlr/common/list.h"
-#include "wayland.h"
+#include <wlr/types.h>
+#include <wlr/common/list.h>
+#include "types.h"
struct wlr_output *wlr_output_create(struct wlr_output_impl *impl,
struct wlr_output_state *state) {