X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.c;h=f5fcebebe7a1c26028593ebd93446e5eefb2d4ad;hb=d01efa07444e49aafd78e0aa822168da688d53f5;hp=c53f9cdb6acb1c3cd055bd7698d18b03a97c7082;hpb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;p=elogind.git

diff --git a/src/shared/util.c b/src/shared/util.c
index c53f9cdb6..f5fcebebe 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -60,10 +60,14 @@
 #include <locale.h>
 #include <sys/personality.h>
 #include <sys/xattr.h>
-#include <libgen.h>
 #include <sys/statvfs.h>
 #include <sys/file.h>
 #include <linux/fs.h>
+
+/* 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 <libgen.h>
 #undef basename
 
 #ifdef HAVE_SYS_AUXV_H