[src/trunk]: src/external/bsd/fetch/lib Avoid redefining _REENTRANT under san...

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

details:   https://anonhg.NetBSD.org/src/rev/4329eb5da324
branches:  trunk
changeset: 972635:4329eb5da324
user:      kamil <kamil%NetBSD.org@localhost>
date:      Mon Jun 01 00:55:24 2020 +0000

description:
Avoid redefining _REENTRANT under sanitizers

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

diffstat:

 external/bsd/fetch/dist/libfetch/http.c |  4 +++-
 external/bsd/fetch/lib/Makefile         |  6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r c2c69e100fde -r 4329eb5da324 external/bsd/fetch/dist/libfetch/http.c
--- a/external/bsd/fetch/dist/libfetch/http.c   Mon Jun 01 00:34:25 2020 +0000
+++ b/external/bsd/fetch/dist/libfetch/http.c   Mon Jun 01 00:55:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: http.c,v 1.3 2014/01/07 02:13:00 joerg Exp $   */
+/*     $NetBSD: http.c,v 1.4 2020/06/01 00:55:24 kamil Exp $   */
 /*-
  * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2003 Thomas Klausner <wiz%NetBSD.org@localhost>
@@ -68,8 +68,10 @@
 #define _GNU_SOURCE
 #endif
 
+#ifndef _REENTRANT
 /* Needed for gmtime_r on Interix */
 #define _REENTRANT
+#endif
 
 #if HAVE_CONFIG_H
 #include "config.h"
diff -r c2c69e100fde -r 4329eb5da324 external/bsd/fetch/lib/Makefile
--- a/external/bsd/fetch/lib/Makefile   Mon Jun 01 00:34:25 2020 +0000
+++ b/external/bsd/fetch/lib/Makefile   Mon Jun 01 00:55:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/02/08 00:11:18 kamil Exp $
+# $NetBSD: Makefile,v 1.17 2020/06/01 00:55:24 kamil Exp $
 
 LIB=           fetch
 SRCS=          fetch.c common.c ftp.c http.c file.c
@@ -32,10 +32,6 @@
        ${HOST_SH} ${LIBFETCHDIR}/errlist.sh http_errlist HTTP \
            ${LIBFETCHDIR}/http.errors > ${.TARGET}
 
-.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
-CFLAGS+=       -Wno-macro-redefined # _REENTRANT redefined
-.endif
-
 COPTS.http.c+= ${GCC_NO_STRINGOP_TRUNCATION}
 
 .include <bsd.lib.mk>