__S_ISTYPE doesn't exist in all C libraries, so define it if it's missing. Additionaly, replace one occurence where it wasn't actually needed.
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com> --- src/lxc/conf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index e6efcf0..3c44ea5 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -166,6 +166,11 @@ return -1; } #endif +/* Define __S_ISTYPE if missing from the C library */ +#ifndef __S_ISTYPE +#define __S_ISTYPE(mode, mask) (((mode) & S_IFMT) == (mask)) +#endif + char *lxchook_names[NUM_LXC_HOOKS] = { "pre-start", "pre-mount", "mount", "start", "post-stop" }; @@ -590,7 +595,7 @@ int pin_rootfs(const char *rootfs) return -1; } - if (!__S_ISTYPE(s.st_mode, S_IFDIR)) + if (!S_ISDIR(s.st_mode)) return -2; ret = snprintf(absrootfspin, MAXPATHLEN, "%s%s", absrootfs, ".hold"); -- 1.8.0 ------------------------------------------------------------------------------ Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS and more. Get SQL Server skills now (including 2012) with LearnDevNow - 200+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only - learn more at: http://p.sf.net/sfu/learnmore_122512 _______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel