author | Martin Stransky <stransky@redhat.com> |
Fri, 09 Nov 2018 11:30:24 +0000 | |
changeset 501840 | 130c60233efa84ffb5f6814ea709d9913ee6fbcc |
parent 501839 | ea9a6719f0c7244a7d63316b1d0cb7dc41f9a0c3 |
child 501841 | f63693feadd5bb35a11558d31a5dec4ec62db23e |
push id | 10290 |
push user | ffxbld-merge |
push date | Mon, 03 Dec 2018 16:23:23 +0000 |
treeherder | mozilla-beta@700bed2445e6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jhorak |
bugs | 1504904 |
milestone | 65.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/gtk/mozwayland/mozwayland.c +++ b/widget/gtk/mozwayland/mozwayland.c @@ -1,17 +1,19 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* vim:expandtab:shiftwidth=4:tabstop=4: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <stdlib.h> #include "mozilla/Types.h" #include <gtk/gtk.h> +#include <gtk/gtkx.h> #include <gdk/gdkwayland.h> union wl_argument; /* Those strucures are just placeholders and will be replaced by * real symbols from libwayland during run-time linking. We need to make * them explicitly visible. */ @@ -295,8 +297,18 @@ wl_egl_window_destroy(struct wl_egl_wind } MOZ_EXPORT void wl_egl_window_resize(struct wl_egl_window *egl_window, int width, int height, int dx, int dy) { } + +MOZ_EXPORT GType +gdk_wayland_display_get_type(void) +{ + // This shouldn't be ever called. + abort(); + + return GDK_TYPE_X11_DISPLAY; +} +