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/core/kmod-setup.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/core/kmod-setup.c')
-rw-r--r-- | src/core/kmod-setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 30b42fffe5..066b959770 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -21,7 +21,7 @@ #include <string.h> #include <unistd.h> -#ifdef HAVE_KMOD +#if HAVE_KMOD #include <libkmod.h> #endif @@ -33,7 +33,7 @@ #include "macro.h" #include "string-util.h" -#ifdef HAVE_KMOD +#if HAVE_KMOD static void systemd_kmod_log( void *data, int priority, @@ -85,7 +85,7 @@ static bool has_virtio_rng(void) { #endif int kmod_setup(void) { -#ifdef HAVE_KMOD +#if HAVE_KMOD static const struct { const char *module; @@ -103,7 +103,7 @@ int kmod_setup(void) { /* this should never be a module */ { "unix", "/proc/net/unix", true, true, NULL }, -#ifdef HAVE_LIBIPTC +#if HAVE_LIBIPTC /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */ { "ip_tables", "/proc/net/ip_tables_names", false, false, NULL }, #endif |