Module Name: src
Committed By: joerg
Date: Wed Apr 16 20:39:55 UTC 2014
Modified Files:
src/common/lib/libc/string: bcopy.c
Log Message:
Undef possible macro versions of memcpy and friends for kernel builds
too. libkern sometimes defines them to the builtins.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/string/bcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/string/bcopy.c
diff -u src/common/lib/libc/string/bcopy.c:1.10 src/common/lib/libc/string/bcopy.c:1.11
--- src/common/lib/libc/string/bcopy.c:1.10 Mon Apr 14 18:18:58 2014
+++ src/common/lib/libc/string/bcopy.c Wed Apr 16 20:39:55 2014
@@ -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 @@ __RCSID("$NetBSD: bcopy.c,v 1.10 2014/04
#endif
#endif
-#ifdef _FORTIFY_SOURCE
+#if defined(_FORTIFY_SOURCE) || defined(_STANDALONE) || defined(_KERNEL)
#undef bcopy
#undef memcpy
#undef memmove
