[mutter/wip/lantw/wayland-on-freebsd: 5/5] main: Fix build when native backend is disabled
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/lantw/wayland-on-freebsd: 5/5] main: Fix build when native backend is disabled
- Date: Wed, 21 Mar 2018 13:15:45 +0000 (UTC)
commit a5fd9a6e2f6e8a09bc7ed390ea828c4fc78a2806
Author: Ting-Wei Lan <lantw src gnome org>
Date: Fri Feb 16 04:42:48 2018 +0800
main: Fix build when native backend is disabled
src/core/main.c | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/src/core/main.c b/src/core/main.c
index 079f6a9ef..be7a90feb 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -432,7 +432,11 @@ calculate_compositor_configuration (MetaCompositorType *compositor_type,
#ifdef HAVE_WAYLAND
gboolean run_as_wayland_compositor = opt_wayland && !opt_x11;
+#ifdef HAVE_NATIVE_BACKEND
if ((opt_wayland || opt_nested || opt_display_server) && opt_x11)
+#else
+ if ((opt_wayland || opt_nested) && opt_x11)
+#endif
{
meta_warning ("Can't run both as Wayland compositor and X11 compositing manager\n");
meta_exit (META_EXIT_ERROR);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]