X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=2bbdce81413e7902eb08b5375f14cadebc3271db;hb=refs%2Ftags%2F12.91.0;hp=14be511279d11edeb3f955f47d609391e5d2f85e;hpb=de7cdb0314af94939b8d57e10afc2a1553ae82da;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 14be511..2bbdce8 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -39,7 +39,9 @@
 
 #include <libweston/backend-drm.h>
 #include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_HEADLESS
 #include <libweston/backend-headless.h>
+#endif
 #ifdef HAVE_BACKEND_X11
 #include <libweston/backend-x11.h>
 #endif
@@ -752,6 +754,10 @@ ivi_enable_remote_outputs(struct ivi_compositor *ivi)
 		}
 
 		ivi_output = zalloc(sizeof(*ivi_output));
+		if (!ivi_output) {
+			free(_name);
+			continue;
+		}
 
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
@@ -804,6 +810,10 @@ ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
 		}
 
 		ivi_output = zalloc(sizeof(*ivi_output));
+		if (!ivi_output) {
+			free(_name);
+			continue;
+		}
 
 		ivi_output->ivi = ivi;
 		ivi_output->name = _name;
@@ -1087,6 +1097,7 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 }
 #endif
 
+#ifdef HAVE_BACKEND_HEADLESS
 static int
 load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 {
@@ -1134,6 +1145,13 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
 	return 0;
 }
+#else
+static int
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+{
+	return -1;
+}
+#endif
 
 static int
 load_backend(struct ivi_compositor *ivi, const char *backend,
@@ -1248,7 +1266,7 @@ compositor_init_config(struct weston_compositor *compositor,
 				      &compositor->kb_repeat_delay, 400);
 
 	weston_config_section_get_bool(section, "vt-switching",
-				       &vt_switching, true);
+				       &vt_switching, false);
 	compositor->vt_switching = vt_switching;
 
 	/* agl-compositor.ini [core] */