Module Name: src
Committed By: kamil
Date: Mon Jun 1 00:55:25 UTC 2020
Modified Files:
src/external/bsd/fetch/dist/libfetch: http.c
src/external/bsd/fetch/lib: Makefile
Log Message:
Avoid redefining _REENTRANT under sanitizers
Switch away from -Wno-macro-redefined which was Clang/LLVM specific.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/fetch/dist/libfetch/http.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/fetch/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/http.c
diff -u src/external/bsd/fetch/dist/libfetch/http.c:1.3 src/external/bsd/fetch/dist/libfetch/http.c:1.4
--- src/external/bsd/fetch/dist/libfetch/http.c:1.3 Tue Jan 7 02:13:00 2014
+++ src/external/bsd/fetch/dist/libfetch/http.c Mon Jun 1 00:55:24 2020
@@ -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 <w...@netbsd.org>
@@ -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"
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.16 src/external/bsd/fetch/lib/Makefile:1.17
--- src/external/bsd/fetch/lib/Makefile:1.16 Sat Feb 8 00:11:18 2020
+++ src/external/bsd/fetch/lib/Makefile Mon Jun 1 00:55:24 2020
@@ -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 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${
${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>
