diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-03 10:41:51 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-10-04 12:09:29 +0200 |
| commit | 349cc4a507c4d84fcadf61f42159ea6412717896 (patch) | |
| tree | 8d6e64af681fb4e1e41a1fc01b4f225f56aa147d /src/shared/journal-util.c | |
| parent | meson: check for sys/auxv.h (diff) | |
| download | systemd-349cc4a507c4d84fcadf61f42159ea6412717896.tar.xz systemd-349cc4a507c4d84fcadf61f42159ea6412717896.zip | |
build-sys: use #if Y instead of #ifdef Y everywhere
The advantage is that is the name is mispellt, cpp will warn us.
$ git grep -Ee "conf.set\('(HAVE|ENABLE)_" -l|xargs sed -r -i "s/conf.set\('(HAVE|ENABLE)_/conf.set10('\1_/"
$ git grep -Ee '#ifn?def (HAVE|ENABLE)' -l|xargs sed -r -i 's/#ifdef (HAVE|ENABLE)/#if \1/; s/#ifndef (HAVE|ENABLE)/#if ! \1/;'
$ git grep -Ee 'if.*defined\(HAVE' -l|xargs sed -i -r 's/defined\((HAVE_[A-Z0-9_]*)\)/\1/g'
$ git grep -Ee 'if.*defined\(ENABLE' -l|xargs sed -i -r 's/defined\((ENABLE_[A-Z0-9_]*)\)/\1/g'
+ manual changes to meson.build
squash! build-sys: use #if Y instead of #ifdef Y everywhere
v2:
- fix incorrect setting of HAVE_LIBIDN2
Diffstat (limited to 'src/shared/journal-util.c')
| -rw-r--r-- | src/shared/journal-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c index 8479221a44..fff3dfc9d1 100644 --- a/src/shared/journal-util.c +++ b/src/shared/journal-util.c @@ -28,7 +28,7 @@ #include "user-util.h" static int access_check_var_log_journal(sd_journal *j) { -#ifdef HAVE_ACL +#if HAVE_ACL _cleanup_strv_free_ char **g = NULL; const char* dir; #endif @@ -48,7 +48,7 @@ static int access_check_var_log_journal(sd_journal *j) { if (r > 0) return 0; -#ifdef HAVE_ACL +#if HAVE_ACL if (laccess("/run/log/journal", F_OK) >= 0) dir = "/run/log/journal"; else |