diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-30 03:34:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-30 03:34:51 +0000 |
| commit | d5963ad1092457dd94df5e9cc67f3c368700168e (patch) | |
| tree | fb06a781f8573ebf6927090100ade11a26b30278 | |
| parent | 224c2674abc716397b1a45aad31608f3bf6cdd78 (diff) | |
| parent | b5fe434feaded498c2fd614688fb4ccc0671d09d (diff) | |
| download | gtk+-d5963ad1092457dd94df5e9cc67f3c368700168e.tar.gz | |
Merge branch 'revert-224c2674' into 'master'
Revert "Merge branch 'gtk_egl_wayland' into 'master'"
See merge request GNOME/gtk!3018
| -rw-r--r-- | gdk/wayland/gdksurface-wayland.c | 2 | ||||
| -rw-r--r-- | gdk/wayland/gdkwaylandsurface.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index 296acdf2bb..dd0d1891fa 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -4209,7 +4209,7 @@ gdk_wayland_surface_get_wl_output (GdkSurface *surface) return NULL; } -struct wl_egl_window * +static struct wl_egl_window * gdk_wayland_surface_get_wl_egl_window (GdkSurface *surface) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h index 180903ff7c..851a4d5607 100644 --- a/gdk/wayland/gdkwaylandsurface.h +++ b/gdk/wayland/gdkwaylandsurface.h @@ -62,9 +62,6 @@ GType gdk_wayland_popup_get_type (void); GDK_AVAILABLE_IN_ALL struct wl_surface *gdk_wayland_surface_get_wl_surface (GdkSurface *surface); -GDK_AVAILABLE_IN_ALL -struct wl_egl_window *gdk_wayland_surface_get_wl_egl_window (GdkSurface *surface); - typedef void (*GdkWaylandToplevelExported) (GdkToplevel *toplevel, const char *handle, gpointer user_data); |