Module Name: src
Committed By: he
Date: Thu Jun 18 15:22:24 UTC 2009
Modified Files:
src/common/lib/libc/hash/sha2: sha2.c
src/sys/lib/libkern/arch/vax: Makefile.inc
Log Message:
Back out the addition of memset.c to the vax libkern, and instead do
as tsutsui@ suggested, and include <sys/param.h> in sha2.c instead.
On the vax, this causes <machine/macros.h> to be included, and it contains
that machine's memset() macro+inline.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/hash/sha2/sha2.c
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/vax/Makefile.inc
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/hash/sha2/sha2.c
diff -u src/common/lib/libc/hash/sha2/sha2.c:1.15 src/common/lib/libc/hash/sha2/sha2.c:1.16
--- src/common/lib/libc/hash/sha2/sha2.c:1.15 Sun Jun 14 14:04:07 2009
+++ src/common/lib/libc/hash/sha2/sha2.c Thu Jun 18 15:22:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $ */
+/* $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $ */
/* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */
/*
@@ -41,16 +41,17 @@
#endif
#include <sys/cdefs.h>
+#include <sys/param.h>
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $");
#include <lib/libkern/libkern.h>
#else
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $");
+__RCSID("$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
Index: src/sys/lib/libkern/arch/vax/Makefile.inc
diff -u src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 src/sys/lib/libkern/arch/vax/Makefile.inc:1.21
--- src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 Thu Jun 18 07:56:04 2009
+++ src/sys/lib/libkern/arch/vax/Makefile.inc Thu Jun 18 15:22:24 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.20 2009/06/18 07:56:04 he Exp $
+# $NetBSD: Makefile.inc,v 1.21 2009/06/18 15:22:24 he Exp $
#
# The rest of the lib routines are in machine/macros.h
#
SRCS+= __assert.c \
blkcpy.S blkset.S bswap16.S bswap32.S bswap64.S \
- __main.c memchr.c memcmp.c memset.c \
+ __main.c memchr.c memcmp.c \
random.S \
strcasecmp.c strcat.c strcmp.c strcpy.c strncasecmp.c strncmp.c \
strncpy.c strlen.c strtoul.c \
