[mutter/wip/lantw/wayland-on-freebsd: 3/3] main: Fix build when native backend is disabled



commit 704b4ff69cda927f75b5c5189d8b77c7bfb0c15e
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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/src/core/main.c b/src/core/main.c
index 079f6a9ef..77ab8c465 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;
 
-  if ((opt_wayland || opt_nested || opt_display_server) && opt_x11)
+  if ((opt_wayland || opt_nested
+#ifdef HAVE_NATIVE_BACKEND
+      || opt_display_server
+#endif
+      ) && opt_x11)
     {
       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]