[gtk+/wip/baedert/meson: 819/841] wayland: Include generated sources from builddir, not srcdir
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/meson: 819/841] wayland: Include generated sources from builddir, not srcdir
- Date: Thu, 3 Nov 2016 11:16:52 +0000 (UTC)
commit bf49d70420b653080bbfa19c3841477039932cf3
Author: Timm Bäder <mail baedert org>
Date: Sat Sep 10 20:39:07 2016 +0200
wayland: Include generated sources from builddir, not srcdir
gdk/wayland/gdkdisplay-wayland.c | 6 +++---
gdk/wayland/gdkwindow-wayland.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 9cdb955..a5dfc4f 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -42,10 +42,10 @@
#include "gdkprivate-wayland.h"
#include "gdkglcontext-wayland.h"
#include "gdkwaylandmonitor.h"
-#include "pointer-gestures-unstable-v1-client-protocol.h"
+#include <wayland/pointer-gestures-unstable-v1-client-protocol.h>
#include "tablet-unstable-v2-client-protocol.h"
-#include "xdg-shell-unstable-v6-client-protocol.h"
-#include "xdg-foreign-unstable-v1-client-protocol.h"
+#include <wayland/xdg-shell-unstable-v6-client-protocol.h>
+#include <wayland/xdg-foreign-unstable-v1-client-protocol.h>
/**
* SECTION:wayland_interaction
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 41672fb..ec09c73 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -32,7 +32,7 @@
#include "gdkinternals.h"
#include "gdkdeviceprivate.h"
#include "gdkprivate-wayland.h"
-#include "xdg-shell-unstable-v6-client-protocol.h"
+#include <wayland/xdg-shell-unstable-v6-client-protocol.h>
#include <stdlib.h>
#include <stdio.h>
@@ -3205,9 +3205,9 @@ gdk_wayland_window_fullscreen_on_monitor (GdkWindow *window, gint monitor)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkScreen *screen = gdk_window_get_screen (window);
- struct wl_output *fullscreen_output =
+ struct wl_output *fullscreen_output =
_gdk_wayland_screen_get_wl_output (screen, monitor);
-
+
if (GDK_WINDOW_DESTROYED (window))
return;
@@ -3245,7 +3245,7 @@ static void
gdk_wayland_window_unfullscreen (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
+
if (GDK_WINDOW_DESTROYED (window))
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]