Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/lib/libc/net Avoid redefining _REENTRANT under sanitizers



details:   https://anonhg.NetBSD.org/src/rev/bb713d2997d2
branches:  trunk
changeset: 972636:bb713d2997d2
user:      kamil <kamil%NetBSD.org@localhost>
date:      Mon Jun 01 01:03:21 2020 +0000

description:
Avoid redefining _REENTRANT under sanitizers

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

diffstat:

 tests/lib/libc/net/Makefile        |  6 +-----
 tests/lib/libc/net/h_nsd_recurse.c |  6 ++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 4329eb5da324 -r bb713d2997d2 tests/lib/libc/net/Makefile
--- a/tests/lib/libc/net/Makefile       Mon Jun 01 00:55:24 2020 +0000
+++ b/tests/lib/libc/net/Makefile       Mon Jun 01 01:03:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/02/08 00:11:18 kamil Exp $
+# $NetBSD: Makefile,v 1.14 2020/06/01 01:03:21 kamil Exp $
 
 .include <bsd.own.mk>
 
@@ -41,8 +41,4 @@
 
 CLEANFILES+=   aton_ether_subr.c
 
-.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
-COPTS.h_nsd_recurse.c+=        -Wno-macro-redefined # _REENTRANT redefined
-.endif
-
 .include <bsd.test.mk>
diff -r 4329eb5da324 -r bb713d2997d2 tests/lib/libc/net/h_nsd_recurse.c
--- a/tests/lib/libc/net/h_nsd_recurse.c        Mon Jun 01 00:55:24 2020 +0000
+++ b/tests/lib/libc/net/h_nsd_recurse.c        Mon Jun 01 01:03:21 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: h_nsd_recurse.c,v 1.2 2011/01/13 02:24:51 pgoyette Exp $ */
+/*     $NetBSD: h_nsd_recurse.c,v 1.3 2020/06/01 01:03:21 kamil Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,9 +32,11 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_nsd_recurse.c,v 1.2 2011/01/13 02:24:51 pgoyette Exp $");
+__RCSID("$NetBSD: h_nsd_recurse.c,v 1.3 2020/06/01 01:03:21 kamil Exp $");
 
+#ifndef        _REENTRANT
 #define        _REENTRANT
+#endif
 
 #include <assert.h>
 #include <nsswitch.h>



Home | Main Index | Thread Index | Old Index