libkern.h maps memcmp, memset and strcpy to the compiler builtins on

some platforms, so make sure to #undef them first.
This commit is contained in:
joerg 2011-11-08 16:52:11 +00:00
parent 7964dc0f2c
commit 4041630e67
4 changed files with 10 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: memcmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $ */
/* $NetBSD: memcmp.c,v 1.3 2011/11/08 16:52:11 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: memcmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
__RCSID("$NetBSD: memcmp.c,v 1.3 2011/11/08 16:52:11 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -48,6 +48,7 @@ __RCSID("$NetBSD: memcmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
#include <lib/libkern/libkern.h>
#endif
#undef memcmp
/*
* Compare memory regions.
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: memset.c,v 1.8 2009/03/18 12:25:06 tsutsui Exp $ */
/* $NetBSD: memset.c,v 1.9 2011/11/08 16:52:11 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: memset.c,v 1.8 2009/03/18 12:25:06 tsutsui Exp $");
__RCSID("$NetBSD: memset.c,v 1.9 2011/11/08 16:52:11 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -60,8 +60,8 @@ __RCSID("$NetBSD: memset.c,v 1.8 2009/03/18 12:25:06 tsutsui Exp $");
#ifdef _FORTIFY_SOURCE
#undef bzero
#undef memset
#endif
#undef memset
#ifndef __OPTIMIZE_SIZE__
#ifdef BZERO

View File

@ -49,11 +49,11 @@
#ifdef _FORTIFY_SOURCE
#undef bzero
#undef memset
#endif
#undef memset
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: memset2.c,v 1.2 2009/12/14 00:39:01 matt Exp $");
__RCSID("$NetBSD: memset2.c,v 1.3 2011/11/08 16:52:11 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: strcpy.c,v 1.2 2007/06/04 18:19:27 christos Exp $ */
/* $NetBSD: strcpy.c,v 1.3 2011/11/08 16:52:11 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: strcpy.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
__RCSID("$NetBSD: strcpy.c,v 1.3 2011/11/08 16:52:11 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -45,9 +45,7 @@ __RCSID("$NetBSD: strcpy.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
#include <lib/libkern/libkern.h>
#endif
#ifdef _FORTIFY_SOURCE
#undef strcpy
#endif
char *
strcpy(char *to, const char *from)