[src/trunk]: src/common/lib/libc/string Undef possible macro versions of memc...

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

details:   https://anonhg.NetBSD.org/src/rev/c41121d41b23
branches:  trunk
changeset: 328750:c41121d41b23
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Apr 16 20:39:55 2014 +0000

description:
Undef possible macro versions of memcpy and friends for kernel builds
too. libkern sometimes defines them to the builtins.

diffstat:

 common/lib/libc/string/bcopy.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5950fbba5816 -r c41121d41b23 common/lib/libc/string/bcopy.c
--- a/common/lib/libc/string/bcopy.c    Wed Apr 16 19:25:28 2014 +0000
+++ b/common/lib/libc/string/bcopy.c    Wed Apr 16 20:39:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcopy.c,v 1.10 2014/04/14 18:18:58 joerg Exp $ */
+/*     $NetBSD: bcopy.c,v 1.11 2014/04/16 20:39:55 joerg Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)bcopy.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: bcopy.c,v 1.10 2014/04/14 18:18:58 joerg Exp $");
+__RCSID("$NetBSD: bcopy.c,v 1.11 2014/04/16 20:39:55 joerg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -51,7 +51,7 @@
 #endif
 #endif
 
-#ifdef _FORTIFY_SOURCE
+#if defined(_FORTIFY_SOURCE) || defined(_STANDALONE) || defined(_KERNEL)
 #undef bcopy
 #undef memcpy
 #undef memmove