From a394f952cd48d5ed5fabf723f53dd7b0edf1e0c4 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 5 Jun 2017 23:41:59 +0200 Subject: [PATCH] conf: fix bionic builds bionic seems to lack a definition of __S_ISTYPE(). Signed-off-by: Christian Brauner --- src/lxc/conf.c | 5 ----- src/lxc/utils.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index d32b2a772..e0a13ef74 100644 --- 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 cb2298b8b..916ee56a6 100644 --- 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