chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: no need to negate error codes, log_error_errno() already does it
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index c53f9cdb6acb1c3cd055bd7698d18b03a97c7082..3a633512473d7d7c93d0574ed9b27064490f7a3f 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-39,7
+39,7
@@
#include <linux/tiocl.h>
#include <termios.h>
#include <stdarg.h>
#include <linux/tiocl.h>
#include <termios.h>
#include <stdarg.h>
-#include <
sys/
poll.h>
+#include <poll.h>
#include <ctype.h>
#include <sys/prctl.h>
#include <sys/utsname.h>
#include <ctype.h>
#include <sys/prctl.h>
#include <sys/utsname.h>
@@
-60,10
+60,14
@@
#include <locale.h>
#include <sys/personality.h>
#include <sys/xattr.h>
#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>
#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
#undef basename
#ifdef HAVE_SYS_AUXV_H