[src/trunk]: src/sys/arch/hpc/stand fix build failure.

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

details:   https://anonhg.NetBSD.org/src/rev/b5303f0ae17a
branches:  trunk
changeset: 769797:b5303f0ae17a
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Fri Sep 23 16:00:15 2011 +0000

description:
fix build failure.

diffstat:

 sys/arch/hpc/stand/hpcboot/hpcboot.config |   4 +++-
 sys/arch/hpc/stand/libsa/dkcksum.c        |   2 ++
 sys/arch/hpc/stand/libsa/libsa.config     |   8 +++++---
 sys/arch/hpc/stand/libsa/stand.h          |   3 ++-
 sys/arch/hpc/stand/libsa/stricmp.cpp      |   4 ++--
 sys/arch/hpc/stand/libsa/strtok.cpp       |   3 ++-
 sys/arch/hpc/stand/libsa/tolower.cpp      |   4 ++--
 sys/arch/hpc/stand/libsa/ufs.c            |   2 ++
 sys/arch/hpc/stand/libsa/winblk.c         |  10 +++++-----
 sys/arch/hpc/stand/libz/libz.config       |   4 +++-
 10 files changed, 28 insertions(+), 16 deletions(-)

diffs (186 lines):

diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/hpcboot/hpcboot.config
--- a/sys/arch/hpc/stand/hpcboot/hpcboot.config Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/hpcboot/hpcboot.config Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hpcboot.config,v 1.12 2010/04/06 16:20:27 nonaka Exp $
+# $NetBSD: hpcboot.config,v 1.13 2011/09/23 16:00:15 nonaka Exp $
 # config file/script to generate project file (.dsp/.vcp) for hpcboot
 
 TYPE=application
@@ -67,6 +67,8 @@
        __COMPILER_INT64__=__int64
        __COMPILER_UINT64__="unsigned#__int64"
        LIBSA_RENAME_PRINTF
+       __VA_LIST_DECLARED
+       __builtin_va_list="char#*"
 '
 INCDIR_LIST='
        .
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/dkcksum.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpc/stand/libsa/dkcksum.c        Fri Sep 23 16:00:15 2011 +0000
@@ -0,0 +1,2 @@
+#include <stand.h>
+#include "../../../../lib/libsa/dkcksum.c"
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/libsa.config
--- a/sys/arch/hpc/stand/libsa/libsa.config     Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/libsa.config     Fri Sep 23 16:00:15 2011 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: libsa.config,v 1.6 2006/01/18 01:04:04 uwe Exp $
+# $NetBSD: libsa.config,v 1.7 2011/09/23 16:00:15 nonaka Exp $
 
 # config file/script to generate project file (.dsp) for libsa
 
@@ -7,8 +7,8 @@
 
 NAME='libsa'
 SRCFILE_LIST='
-       ../../../../lib/libsa/dkcksum.c
-       ../../../../lib/libsa/ufs.c
+       dkcksum.c
+       ufs.c
        panic.c
        alloc.c
        winblk.c
@@ -29,6 +29,8 @@
        LIBSA_USE_MEMCPY
        LIBSA_USE_MEMSET
        LIBKERN_INLINE=__inline
+       __builtin_va_list="char#*"
+       _SYS_STDARG_H_
 '
 INCDIR_LIST='
        .
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/stand.h
--- a/sys/arch/hpc/stand/libsa/stand.h  Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/stand.h  Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stand.h,v 1.4 2006/01/25 18:28:26 christos Exp $       */
+/*     $NetBSD: stand.h,v 1.5 2011/09/23 16:00:15 nonaka Exp $ */
 
 /*-
  * Copyright (c) 1999 Shin Takemura.
@@ -44,4 +44,5 @@
 int win_printf(LPWSTR lpszFmt, ...);
 
 #endif /* STANDALONE_WINDOWS_SIDE */
+#include <stdarg.h>
 #include "../../../../lib/libsa/stand.h"
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/stricmp.cpp
--- a/sys/arch/hpc/stand/libsa/stricmp.cpp      Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/stricmp.cpp      Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stricmp.cpp,v 1.3 2008/04/28 20:23:21 martin Exp $     */
+/*     $NetBSD: stricmp.cpp,v 1.4 2011/09/23 16:00:15 nonaka Exp $     */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -29,6 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "stand.h"
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <libsa_string.h>
@@ -47,4 +48,3 @@
 }
 __END_DECLS
 LIBSA_NAMESPACE_END
-
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/strtok.cpp
--- a/sys/arch/hpc/stand/libsa/strtok.cpp       Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/strtok.cpp       Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strtok.cpp,v 1.2 2005/12/11 12:17:30 christos Exp $    */
+/*     $NetBSD: strtok.cpp,v 1.3 2011/09/23 16:00:15 nonaka Exp $      */
 
 /*
  * Copyright (c) 1988, 1993
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#include "stand.h"
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdlib.h>
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/tolower.cpp
--- a/sys/arch/hpc/stand/libsa/tolower.cpp      Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/tolower.cpp      Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tolower.cpp,v 1.3 2008/04/28 20:23:21 martin Exp $     */
+/*     $NetBSD: tolower.cpp,v 1.4 2011/09/23 16:00:15 nonaka Exp $     */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -29,6 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "stand.h"
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <libsa_string.h>
@@ -46,4 +47,3 @@
 }
 __END_DECLS
 LIBSA_NAMESPACE_END
-
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/ufs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/hpc/stand/libsa/ufs.c    Fri Sep 23 16:00:15 2011 +0000
@@ -0,0 +1,2 @@
+#include <stand.h>
+#include "../../../../lib/libsa/ufs.c"
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libsa/winblk.c
--- a/sys/arch/hpc/stand/libsa/winblk.c Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libsa/winblk.c Fri Sep 23 16:00:15 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: winblk.c,v 1.6 2011/06/23 11:38:24 nonaka Exp $        */
+/*     $NetBSD: winblk.c,v 1.7 2011/09/23 16:00:15 nonaka Exp $        */
 
 /*-
  * Copyright (c) 1999 Shin Takemura.
@@ -58,7 +58,7 @@
 #endif
 
 #define        islower(c)      ('a' <= (c) && (c) <= 'z')
-#define        toupper(c)      (islower(c) ? ((c) - 'a' + 'A') : (c))
+#define        _toupper(c)     (islower(c) ? ((c) - 'a' + 'A') : (c))
 
 #define        BLKSZ   512
 
@@ -142,9 +142,9 @@
                goto end;
        }
        wsprintf(wdevname, TEXT("%C%C%C%d:"),
-               toupper(devname[0]),
-               toupper(devname[1]),
-               toupper(devname[2]),
+               _toupper(devname[0]),
+               _toupper(devname[1]),
+               _toupper(devname[2]),
                unit);
        DEBUG_PRINTF((TEXT("winblk.open: block device name is '%s'\n"),
                      wdevname));
diff -r 5b05837396b3 -r b5303f0ae17a sys/arch/hpc/stand/libz/libz.config
--- a/sys/arch/hpc/stand/libz/libz.config       Fri Sep 23 15:29:08 2011 +0000
+++ b/sys/arch/hpc/stand/libz/libz.config       Fri Sep 23 16:00:15 2011 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: libz.config,v 1.8 2006/01/18 00:11:27 uwe Exp $
+# $NetBSD: libz.config,v 1.9 2011/09/23 16:00:15 nonaka Exp $
 
 # config file/script to generate project file (.dsp/.vcp) for libz
 
@@ -20,6 +20,8 @@
        __STDC__
        __COMPILER_INT64__=__int64
        __COMPILER_UINT64__="unsigned#__int64"
+       __VA_LIST_DECLARED
+       __builtin_va_list="char#*"
 '
 INCDIR_LIST='
        .