Fix following compile error on ubuntu 12.10

[...]
make[3]: Entering directory `/home/caglar/Projects/lxc/src/tests'
depbase=`echo attach.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        gcc -DHAVE_CONFIG_H -I. -I../../src    -I../../src -DLXCROOTFSMOUNT=\"/usr/lib/x86_64-linux-gnu/lxc/rootfs\" -DLXCPATH=\"/var/lib/lxc\" -DLXC_GLOBAL_CONF=\"/etc/lxc/lxc.conf\" -DLXCINITDIR=\"/usr/libexec\" -DLXC_DEFAULT_CONFIG=\"/etc/lxc/default.conf\"   -g -O2 -Wall -Werror -MT attach.o -MD -MP -MF $depbase.Tpo -c -o attach.o attach.c &&\
        mv -f $depbase.Tpo $depbase.Po
attach.c: In function ‘main’:
attach.c:380:2: error: implicit declaration of function ‘test_lsm_detect’ [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[3]: *** [attach.o] Error 1
[...]

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/tests/attach.c b/src/tests/attach.c
index 54650bde791388c777a8f9113f87a03948524e3f..57a4bddb46c11e57bfd98df9771b5ab6174fce0d 100644 (file)
--- a/src/tests/attach.c
+++ b/src/tests/attach.c
@@ -31,7 +31,6 @@
        fprintf(stderr, "%s:%d " fmt "\n", __FILE__, __LINE__, ##__VA_ARGS__); \
 } while (0)
 
-#if HAVE_APPARMOR || HAVE_SELINUX
 static const char *lsm_config_key = NULL;
 static const char *lsm_label = NULL;
 
@@ -53,6 +52,7 @@ static void test_lsm_detect(void)
        }
 }
 
+#if HAVE_APPARMOR || HAVE_SELINUX
 static void test_attach_lsm_set_config(struct lxc_container *ct)
 {
        ct->load_config(ct, NULL);