From 38776ae2bdfe26fa1a92c44f2794083158b2fb41 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 21 Feb 2017 12:54:44 +0000
Subject: [PATCH 2/2] sd-activation test: Don't declare unused variable with
old AppArmor
AppArmor 2.9.0 on Debian jessie doesn't have aa_features, and in
any case this variable is unused with the older AppArmor versions
that skip this test.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
test/sd-activation.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/sd-activation.c b/test/sd-activation.c
index bf825545..ff4a657f 100644
--- a/test/sd-activation.c
+++ b/test/sd-activation.c
@@ -252,7 +252,7 @@ setup (Fixture *f,
gconstpointer context)
{
const Config *config = context;
-#if defined(DBUS_TEST_APPARMOR_ACTIVATION)
+#if defined(DBUS_TEST_APPARMOR_ACTIVATION) && defined(HAVE_APPARMOR_2_10)
aa_features *features;
#endif
--
2.11.0