[src/trunk]: src/lib/libc/string Fix build problems.

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

details:   https://anonhg.NetBSD.org/src/rev/b7c97ebd1f30
branches:  trunk
changeset: 791146:b7c97ebd1f30
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Nov 06 21:05:27 2013 +0000

description:
Fix build problems.

diffstat:

 lib/libc/string/stpcpy.c  |  8 ++++++--
 lib/libc/string/stpncpy.c |  8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 178d536fb6aa -r b7c97ebd1f30 lib/libc/string/stpcpy.c
--- a/lib/libc/string/stpcpy.c  Wed Nov 06 20:19:03 2013 +0000
+++ b/lib/libc/string/stpcpy.c  Wed Nov 06 21:05:27 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $ */
+/*     $NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $  */
 
 /*
  * Copyright (c) 1999
@@ -36,13 +36,17 @@
 #if 0
 static char sccsid[] = "@(#)strcpy.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $");
+__RCSID("$NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 /* FreeBSD: src/lib/libc/string/stpcpy.c,v 1.2 2009/02/28 06:05:37 das Exp */
 
 #include <string.h>
 
+#ifdef _FORTIFY_SOURCE
+#undef stpcpy
+#endif
+
 char *
 stpcpy(char * __restrict to, const char * __restrict from)
 {
diff -r 178d536fb6aa -r b7c97ebd1f30 lib/libc/string/stpncpy.c
--- a/lib/libc/string/stpncpy.c Wed Nov 06 20:19:03 2013 +0000
+++ b/lib/libc/string/stpncpy.c Wed Nov 06 21:05:27 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $        */
+/*     $NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $ */
 
 /*-
  * Copyright (c) 2009 David Schultz <das%FreeBSD.org@localhost>
@@ -28,12 +28,16 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $");
+__RCSID("$NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
 #endif /* LIBC_SCCS and not lint */
 /* FreeBSD: src/lib/libc/string/stpncpy.c,v 1.1 2009/02/28 06:00:58 das Exp */
 
 #include <string.h>
 
+#ifdef _FORTIFY_SOURCE
+#undef stpncpy
+#endif
+
 char *
 stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
 {