conf: fix bionic builds

bionic seems to lack a definition of __S_ISTYPE().

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index d32b2a7725f38a131973da384cf1fd3b18219a3e..e0a13ef74d84eadf89cdd4d0dbfe035be6cf8f69 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -172,11 +172,6 @@ static int sethostname(const char * name, size_t len)
 }
 #endif
 
-/* Define __S_ISTYPE if missing from the C library */
-#ifndef __S_ISTYPE
-#define        __S_ISTYPE(mode, mask)  (((mode) & S_IFMT) == (mask))
-#endif
-
 #ifndef MS_PRIVATE
 #define MS_PRIVATE (1<<18)
 #endif

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index cb2298b8b3f0177b7c174872c631b9a91c4100c6..916ee56a6869f4080e7d9d630fffc97f85d2087f 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -39,6 +39,11 @@
 
 #include "initutils.h"
 
+/* Define __S_ISTYPE if missing from the C library. */
+#ifndef __S_ISTYPE
+#define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask))
+#endif
+
 /* Useful macros */
 /* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
 #define LXC_NUMSTRLEN64 21