Module Name: src Committed By: kamil Date: Mon Jun 1 00:34:25 UTC 2020
Modified Files: src/external/gpl2/lvm2: lvm2tools.mk src/external/gpl2/lvm2/dist/include: lib.h src/external/gpl2/lvm2/dist/lib/misc: lib.h Log Message: Avoid redefining _REENTRANT under sanitizers Switch away from -Wno-macro-redefined which was Clang specific. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/lvm2tools.mk cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/lvm2/dist/include/lib.h cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/lvm2/dist/lib/misc/lib.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl2/lvm2/lvm2tools.mk diff -u src/external/gpl2/lvm2/lvm2tools.mk:1.6 src/external/gpl2/lvm2/lvm2tools.mk:1.7 --- src/external/gpl2/lvm2/lvm2tools.mk:1.6 Sat Feb 8 00:11:18 2020 +++ src/external/gpl2/lvm2/lvm2tools.mk Mon Jun 1 00:34:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: lvm2tools.mk,v 1.6 2020/02/08 00:11:18 kamil Exp $ +# $NetBSD: lvm2tools.mk,v 1.7 2020/06/01 00:34:25 kamil Exp $ .include <bsd.own.mk> @@ -24,7 +24,3 @@ CPPFLAGS+=-DDM_DEVICE_UID=0 -DDM_DEVICE_ #.endif # #LVM2.liblvm= ${LVM2OBJDIR.liblvm}/liblvm.a - -.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes" -CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined in lib.h -.endif Index: src/external/gpl2/lvm2/dist/include/lib.h diff -u src/external/gpl2/lvm2/dist/include/lib.h:1.1.1.1 src/external/gpl2/lvm2/dist/include/lib.h:1.2 --- src/external/gpl2/lvm2/dist/include/lib.h:1.1.1.1 Mon Dec 22 00:18:44 2008 +++ src/external/gpl2/lvm2/dist/include/lib.h Mon Jun 1 00:34:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.1.1.1 2008/12/22 00:18:44 haad Exp $ */ +/* $NetBSD: lib.h,v 1.2 2020/06/01 00:34:25 kamil Exp $ */ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. @@ -23,7 +23,9 @@ #include "configure.h" +#ifndef _REENTRANT #define _REENTRANT +#endif #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 Index: src/external/gpl2/lvm2/dist/lib/misc/lib.h diff -u src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.1.1.1 src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.2 --- src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.1.1.1 Mon Dec 22 00:18:12 2008 +++ src/external/gpl2/lvm2/dist/lib/misc/lib.h Mon Jun 1 00:34:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.1.1.1 2008/12/22 00:18:12 haad Exp $ */ +/* $NetBSD: lib.h,v 1.2 2020/06/01 00:34:25 kamil Exp $ */ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. @@ -23,7 +23,9 @@ #include "configure.h" +#ifndef _REENTRANT #define _REENTRANT +#endif #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64