From eef46c372f64f40dd75415b2c504c73138719c8d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Feb 2015 18:50:38 +0100 Subject: tree-wide: whenever we include libgen.h, immediately undefine basename() Also, document in adjacent comments and in CODING_STYLE why we do that. --- src/shared/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/shared/util.c') diff --git a/src/shared/util.c b/src/shared/util.c index c53f9cdb6a..f5fcebebe7 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -60,10 +60,14 @@ #include #include #include -#include #include #include #include + +/* When we include libgen.h because we need dirname() we immediately + * undefine basename() since libgen.h defines it as a macro to the XDG + * version which is really broken. */ +#include #undef basename #ifdef HAVE_SYS_AUXV_H -- cgit v1.2.3-54-g00ecf