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/libsystemd/sd-bus/bus-kernel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/libsystemd/sd-bus/bus-kernel.c') diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 1714188ffd..b884074d95 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -25,10 +25,15 @@ #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 + #include "util.h" #include "strv.h" #include "memfd-util.h" -- cgit v1.2.3-54-g00ecf