[Mesa-dev] [PATCH 1/7] wayland-egl: rename wayland-egl-{priv, backend}.h

Emil Velikov emil.l.velikov at gmail.com
Fri Sep 29 12:14:36 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

In preparation to lifting the whole thing out to the wayland repository.

Cc: Daniel Stone <daniels at collabora.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/egl/drivers/dri2/egl_dri2.h                                       | 2 +-
 src/egl/wayland/wayland-egl/Makefile.am                               | 2 +-
 src/egl/wayland/wayland-egl/wayland-egl-abi-check.c                   | 4 ++--
 .../wayland/wayland-egl/{wayland-egl-priv.h => wayland-egl-backend.h} | 0
 src/egl/wayland/wayland-egl/wayland-egl.c                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/egl/wayland/wayland-egl/{wayland-egl-priv.h => wayland-egl-backend.h} (100%)

diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 10a41518172..f90ad4bc4b7 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -44,7 +44,7 @@
 
 #ifdef HAVE_WAYLAND_PLATFORM
 #include <wayland-client.h>
-#include "wayland-egl-priv.h"
+#include "wayland-egl-backend.h"
 /* forward declarations of protocol elements */
 struct zwp_linux_dmabuf_v1;
 #endif
diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
index 34394a17f0e..7dde9552f33 100644
--- a/src/egl/wayland/wayland-egl/Makefile.am
+++ b/src/egl/wayland/wayland-egl/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(DEFINES) \
 	    $(WAYLAND_CLIENT_CFLAGS)
 
 lib_LTLIBRARIES = libwayland-egl.la
-noinst_HEADERS = wayland-egl-priv.h
+noinst_HEADERS = wayland-egl-backend.h
 libwayland_egl_la_SOURCES = wayland-egl.c
 libwayland_egl_la_LDFLAGS = \
 	-no-undefined \
diff --git a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
index 4ea38542a38..66688642c7b 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl-abi-check.c
@@ -23,7 +23,7 @@
 #include <stddef.h> // offsetof
 #include <stdio.h>  // printf
 
-#include "wayland-egl-priv.h" // Current struct wl_egl_window implementation
+#include "wayland-egl-backend.h" // Current struct wl_egl_window implementation
 
 /*
  * Following are previous implementations of wl_egl_window.
@@ -100,7 +100,7 @@ struct wl_egl_window_v3 {
 
 
 /* This program checks we keep a backwards-compatible struct wl_egl_window
- * definition whenever it is modified in wayland-egl-priv.h.
+ * definition whenever it is modified in wayland-egl-backend.h.
  *
  * The previous definition should be added above as a new struct
  * wl_egl_window_vN, and the appropriate checks should be added below
diff --git a/src/egl/wayland/wayland-egl/wayland-egl-priv.h b/src/egl/wayland/wayland-egl/wayland-egl-backend.h
similarity index 100%
rename from src/egl/wayland/wayland-egl/wayland-egl-priv.h
rename to src/egl/wayland/wayland-egl/wayland-egl-backend.h
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c
index f16324c9f61..575f94db498 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl.c
@@ -32,7 +32,7 @@
 
 #include <wayland-client.h>
 #include "wayland-egl.h"
-#include "wayland-egl-priv.h"
+#include "wayland-egl-backend.h"
 
 WL_EGL_EXPORT void
 wl_egl_window_resize(struct wl_egl_window *egl_window,
-- 
2.14.1



More information about the mesa-dev mailing list