From 6a5faa4793cc6bab346cd5845aa783dadf9626ee Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 7 Oct 2016 18:46:41 +0100 Subject: [PATCH] Fix remaining -Wundef warnings, and enable it Vaguely based on a patch from Thomas Zimmermann, but with a different solution to RECURSIVE_MARSHAL_WRITE_TRACE, and additionally fixing a build failure that only occurs when you build without libsystemd. (Yes, that's a configuration I test.) Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97357 --- configure.ac | 2 +- dbus/dbus-marshal-recursive-util.c | 3 +++ dbus/dbus-userdb-util.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3fa0e4d..1d33932 100644 --- a/configure.ac +++ b/configure.ac @@ -1366,7 +1366,7 @@ DISABLE_WARNINGS="$DISABLE_WARNINGS -Wno-shadow -Wno-switch-default -Wno-switch-enum - -Wno-undef" + " dnl We are only calling this for its side-effect of setting up dnl --enable-compile-warnings; the WARN_CFLAGS, etc. are ignored, diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c index e00ac5c..c60c72c 100644 --- a/dbus/dbus-marshal-recursive-util.c +++ b/dbus/dbus-marshal-recursive-util.c @@ -35,6 +35,9 @@ #define PRIx64 "I64x" #endif +/** turn this on to get deluged in TypeWriter verbose spam */ +#define RECURSIVE_MARSHAL_WRITE_TRACE 0 + static void basic_value_zero (DBusBasicValue *value) { diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c index 888a23e..44a1a78 100644 --- a/dbus/dbus-userdb-util.c +++ b/dbus/dbus-userdb-util.c @@ -29,7 +29,7 @@ #include "dbus-protocol.h" #include -#if HAVE_SYSTEMD +#ifdef HAVE_SYSTEMD #include #endif -- 2.9.3