fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-11 08:40:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix redefinition of VALGRIND define in "nm-sd-adapt-shared.h"

Browse source 
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 3c581cbb78)
This commit is contained in:
Thomas Haller 2020-05-13 17:20:09 +02:00
parent f8452b48e9
commit 2c9af9db43
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
View file

@ -70,7 +70,9 @@ G_STMT_START { \
/*****************************************************************************/
#ifndef VALGRIND
#define VALGRIND 0
#endif
#define ENABLE_DEBUG_HASHMAP 0