Mesa (master): wayland-egl: rename wayland-egl-{priv,backend}.h
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Oct 2 15:36:42 UTC 2017
Module: Mesa
Branch: master
Commit: 198af27c679c0cabbb8747dd23fed5bd68bfdee2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=198af27c679c0cabbb8747dd23fed5bd68bfdee2
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Sep 28 18:03:58 2017 +0100
wayland-egl: rename wayland-egl-{priv,backend}.h
In preparation to lifting the whole thing out as a separate library.
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Miguel A. Vico <mvicomoya at nvidia.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(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index c70a84bb91..e3bdbb55f5 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 34394a17f0..7dde9552f3 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 4ea38542a3..66688642c7 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 f16324c9f6..575f94db49 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,
More information about the mesa-commit
mailing list