diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-17 13:08:15 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-17 13:08:15 +0200 |
| commit | afc4290e2c48b8a0803247880b6382d639990504 (patch) | |
| tree | d1ad20280f17dc6ae7969c174989e02acb1fc619 /src | |
| parent | 49b59497485887e8ec3af8875f54f02fadb56203 (diff) | |
| parent | 11c9f1e48a683fb2e78ee531016099d567baa19a (diff) | |
Merge pull request #246 from smcv/xpg-not-xdg
Stop talking about the "XDG" version of basename()
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/util.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 4 | ||||
| -rw-r--r-- | src/machine/machine-dbus.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index b7c70af541..e0c5069ff8 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -60,8 +60,8 @@ #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. */ + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include <libgen.h> #undef basename diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 3aaaabf4ed..f08db2da89 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -29,8 +29,8 @@ #include <sys/prctl.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. */ + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include <libgen.h> #undef basename diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 0892479a9a..9f026beb13 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -24,8 +24,8 @@ #include <sys/mount.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. */ + * undefine basename() since libgen.h defines it as a macro to the POSIX + * version which is really broken. We prefer GNU basename(). */ #include <libgen.h> #undef basename |