From 2c9af9db43a22b86a5570648e50d4e9d9422da4e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 13 May 2020 17:20:09 +0200 Subject: [PATCH] build: fix redefinition of VALGRIND define in "nm-sd-adapt-shared.h" When configuring with sanitizers enabled, ./configure.ac sets -DVALGRIND=1 in the CFLAGS. This causes a compilation error later: $ /bin/sh ./libtool --tag=CC --mode=compile gcc ... -DVALGRIND=1 ... src/dhcp/nm-dhcp-nettools.c ... In file included from src/dhcp/nm-dhcp-nettools.c:16: ./shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h:73: error: "VALGRIND" redefined [-Werror] #define VALGRIND 0 (cherry picked from commit 3c581cbb78fb805856ec8ce03bcb993cca0d93d8) --- shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index 26a043f567..e2378c5b4d 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -70,7 +70,9 @@ G_STMT_START { \ /*****************************************************************************/ +#ifndef VALGRIND #define VALGRIND 0 +#endif #define ENABLE_DEBUG_HASHMAP 0