mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland-egl: rename wl_egl_window::private to driver_private

Browse source 
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>
This commit is contained in:
Emil Velikov 2017-12-13 12:03:54 +00:00 • committed by Daniel Stone
parent 8d8f2600ec
commit 9fa60983b5
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
egl/wayland-egl-abi-check.c
View file

@ -91,7 +91,7 @@ struct wl_egl_window_v3 {
int attached_width; int attached_width;
int attached_height; int attached_height;
void *private; void *driver_private;
void (*resize_callback)(struct wl_egl_window *, void *); void (*resize_callback)(struct wl_egl_window *, void *);
void (*destroy_window_callback)(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, dy);
CHECK_MEMBER (_v2, _v3, attached_width); CHECK_MEMBER (_v2, _v3, attached_width);
CHECK_MEMBER (_v2, _v3, attached_height); 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, resize_callback);
CHECK_MEMBER (_v2, _v3, destroy_window_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, dy);
CHECK_MEMBER_CURRENT(_v3, attached_width); CHECK_MEMBER_CURRENT(_v3, attached_width);
CHECK_MEMBER_CURRENT(_v3, attached_height); 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, resize_callback);
CHECK_MEMBER_CURRENT(_v3, destroy_window_callback); CHECK_MEMBER_CURRENT(_v3, destroy_window_callback);
CHECK_MEMBER_CURRENT(_v3, surface); CHECK_MEMBER_CURRENT(_v3, surface);

2
egl/wayland-egl-backend.h
View file

@ -53,7 +53,7 @@ struct wl_egl_window {
int attached_width; int attached_width;
int attached_height; int attached_height;
void *private; void *driver_private;
void (*resize_callback)(struct wl_egl_window *, void *); void (*resize_callback)(struct wl_egl_window *, void *);
void (*destroy_window_callback)(void *); void (*destroy_window_callback)(void *);

4
egl/wayland-egl.c
View file

@ -49,7 +49,7 @@ wl_egl_window_resize(struct wl_egl_window *egl_window,
egl_window->dy = dy; egl_window->dy = dy;
if (egl_window->resize_callback) 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 * WL_EXPORT struct wl_egl_window *
@ -89,7 +89,7 @@ WL_EXPORT void
wl_egl_window_destroy(struct wl_egl_window *egl_window) wl_egl_window_destroy(struct wl_egl_window *egl_window)
{ {
if (egl_window->destroy_window_callback) 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); free(egl_window);
} }