[src/trunk]: src/external/gpl2/lvm2 Avoid redefining _REENTRANT under sanitizers

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2fce9a986dda
branches:  trunk
changeset: 1010669:2fce9a986dda
user:      kamil <kamil%NetBSD.org@localhost>
date:      Mon Jun 01 00:34:25 2020 +0000

description:
Avoid redefining _REENTRANT under sanitizers

Switch away from -Wno-macro-redefined which was Clang specific.

diffstat:

 external/gpl2/lvm2/dist/include/lib.h  |  4 +++-
 external/gpl2/lvm2/dist/lib/misc/lib.h |  4 +++-
 external/gpl2/lvm2/lvm2tools.mk        |  6 +-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r b2f2f0fefa35 -r 2fce9a986dda external/gpl2/lvm2/dist/include/lib.h
--- a/external/gpl2/lvm2/dist/include/lib.h     Mon Jun 01 00:00:37 2020 +0000
+++ b/external/gpl2/lvm2/dist/include/lib.h     Mon Jun 01 00:34:25 2020 +0000
@@ -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
 
diff -r b2f2f0fefa35 -r 2fce9a986dda external/gpl2/lvm2/dist/lib/misc/lib.h
--- a/external/gpl2/lvm2/dist/lib/misc/lib.h    Mon Jun 01 00:00:37 2020 +0000
+++ b/external/gpl2/lvm2/dist/lib/misc/lib.h    Mon Jun 01 00:34:25 2020 +0000
@@ -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
 
diff -r b2f2f0fefa35 -r 2fce9a986dda external/gpl2/lvm2/lvm2tools.mk
--- a/external/gpl2/lvm2/lvm2tools.mk   Mon Jun 01 00:00:37 2020 +0000
+++ b/external/gpl2/lvm2/lvm2tools.mk   Mon Jun 01 00:34:25 2020 +0000
@@ -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 @@
 #.endif
 #
 #LVM2.liblvm=  ${LVM2OBJDIR.liblvm}/liblvm.a
-
-.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
-CFLAGS+=       -Wno-macro-redefined # _REENTRANT redefined in lib.h
-.endif