Fri Jun 19 05:09:09 2009 UTC ()
- move #include <sys/param.h> inside #if defined(_KERNEL) section
  where it's actually required
- add XXX comments that notes <sys/param.h> is required for vax memset(9)


(tsutsui)
diff -r1.16 -r1.17 src/common/lib/libc/hash/sha2/sha2.c
cvs diff -r1.16 -r1.17 src/common/lib/libc/hash/sha2/sha2.c (expand / switch to unified diff)

--- src/common/lib/libc/hash/sha2/sha2.c 2009/06/18 15:22:24 1.16
+++ src/common/lib/libc/hash/sha2/sha2.c 2009/06/19 05:09:09 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $ */ 1/* $NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $ */
2/* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */ 2/* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */
3 3
4/* 4/*
5 * sha2.c 5 * sha2.c
6 * 6 *
7 * Version 1.0.0beta1 7 * Version 1.0.0beta1
8 * 8 *
9 * Written by Aaron D. Gifford <me@aarongifford.com> 9 * Written by Aaron D. Gifford <me@aarongifford.com>
10 * 10 *
11 * Copyright 2000 Aaron D. Gifford. All rights reserved. 11 * Copyright 2000 Aaron D. Gifford. All rights reserved.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -31,37 +31,37 @@ @@ -31,37 +31,37 @@
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE. 35 * SUCH DAMAGE.
36 * 36 *
37 */ 37 */
38 38
39#if HAVE_NBTOOL_CONFIG_H 39#if HAVE_NBTOOL_CONFIG_H
40#include "nbtool_config.h" 40#include "nbtool_config.h"
41#endif 41#endif
42 42
43#include <sys/cdefs.h> 43#include <sys/cdefs.h>
44#include <sys/param.h> 
45 44
46#if defined(_KERNEL) || defined(_STANDALONE) 45#if defined(_KERNEL) || defined(_STANDALONE)
47__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $"); 46__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $");
48 47
 48#include <sys/param.h> /* XXX: to pull <machine/macros.h> for vax memset(9) */
49#include <lib/libkern/libkern.h> 49#include <lib/libkern/libkern.h>
50 50
51#else 51#else
52 52
53#if defined(LIBC_SCCS) && !defined(lint) 53#if defined(LIBC_SCCS) && !defined(lint)
54__RCSID("$NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $"); 54__RCSID("$NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $");
55#endif /* LIBC_SCCS and not lint */ 55#endif /* LIBC_SCCS and not lint */
56 56
57#include "namespace.h" 57#include "namespace.h"
58#include <string.h> 58#include <string.h>
59 59
60#endif 60#endif
61 61
62#include <sys/types.h> 62#include <sys/types.h>
63#include <sys/sha2.h> 63#include <sys/sha2.h>
64 64
65#if HAVE_NBTOOL_CONFIG_H 65#if HAVE_NBTOOL_CONFIG_H
66# if HAVE_SYS_ENDIAN_H 66# if HAVE_SYS_ENDIAN_H
67# include <sys/endian.h> 67# include <sys/endian.h>