diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-12-13 12:03:54 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2018-02-09 17:34:19 +0000 |
| commit | 9fa60983b5799be62b9d88a4059f4d0038d7c80d (patch) | |
| tree | 2af75900436284817460ce8d79f559e782ea5655 | |
| parent | 8d8f2600ecd3b017cb93d34e037cdae27fcded59 (diff) | |
| download | wayland-9fa60983b5799be62b9d88a4059f4d0038d7c80d.tar.gz | |
wayland-egl: rename wl_egl_window::private to driver_private
private is a reserved keyword in C++. Thus if one is to have a backend
driver written in said language build will fail as below:
.../wayland-egl-backend.h:56:8: expected unqualified-id before ‘private’
Rename it to driver_private and update the test.
NOTE: version bump is not required since:
- this is a pure API change, ABI is identical
- hardware drivers already require [minor] changes to move to the
upstream wayland-egl-backend.h
Cc: Arnaud Vrac <rawoul@gmail.com>
Cc: Miguel A . Vico <mvicomoya@nvidia.com>
Suggested-by: Arnaud Vrac <rawoul@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
| -rw-r--r-- | egl/wayland-egl-abi-check.c | 6 | ||||
| -rw-r--r-- | egl/wayland-egl-backend.h | 2 | ||||
| -rw-r--r-- | egl/wayland-egl.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/egl/wayland-egl-abi-check.c b/egl/wayland-egl-abi-check.c index 62c51a2..faa6b57 100644 --- a/egl/wayland-egl-abi-check.c +++ b/egl/wayland-egl-abi-check.c @@ -91,7 +91,7 @@ struct wl_egl_window_v3 { int attached_width; int attached_height; - void *private; + void *driver_private; void (*resize_callback)(struct wl_egl_window *, void *); void (*destroy_window_callback)(void *); @@ -208,7 +208,7 @@ int main(int argc, char **argv) CHECK_MEMBER (_v2, _v3, dy); CHECK_MEMBER (_v2, _v3, attached_width); CHECK_MEMBER (_v2, _v3, attached_height); - CHECK_MEMBER (_v2, _v3, private); + CHECK_RENAMED_MEMBER(_v2, _v3, private, driver_private); CHECK_MEMBER (_v2, _v3, resize_callback); CHECK_MEMBER (_v2, _v3, destroy_window_callback); @@ -223,7 +223,7 @@ int main(int argc, char **argv) CHECK_MEMBER_CURRENT(_v3, dy); CHECK_MEMBER_CURRENT(_v3, attached_width); CHECK_MEMBER_CURRENT(_v3, attached_height); - CHECK_MEMBER_CURRENT(_v3, private); + CHECK_MEMBER_CURRENT(_v3, driver_private); CHECK_MEMBER_CURRENT(_v3, resize_callback); CHECK_MEMBER_CURRENT(_v3, destroy_window_callback); CHECK_MEMBER_CURRENT(_v3, surface); diff --git a/egl/wayland-egl-backend.h b/egl/wayland-egl-backend.h index 3c23a56..869c86f 100644 --- a/egl/wayland-egl-backend.h +++ b/egl/wayland-egl-backend.h @@ -53,7 +53,7 @@ struct wl_egl_window { int attached_width; int attached_height; - void *private; + void *driver_private; void (*resize_callback)(struct wl_egl_window *, void *); void (*destroy_window_callback)(void *); diff --git a/egl/wayland-egl.c b/egl/wayland-egl.c index 02ac04e..a60f899 100644 --- a/egl/wayland-egl.c +++ b/egl/wayland-egl.c @@ -49,7 +49,7 @@ wl_egl_window_resize(struct wl_egl_window *egl_window, egl_window->dy = dy; if (egl_window->resize_callback) - egl_window->resize_callback(egl_window, egl_window->private); + egl_window->resize_callback(egl_window, egl_window->driver_private); } WL_EXPORT struct wl_egl_window * @@ -89,7 +89,7 @@ WL_EXPORT void wl_egl_window_destroy(struct wl_egl_window *egl_window) { if (egl_window->destroy_window_callback) - egl_window->destroy_window_callback(egl_window->private); + egl_window->destroy_window_callback(egl_window->driver_private); free(egl_window); } |