Module Name: src
Committed By: nonaka
Date: Fri Sep 23 16:00:16 UTC 2011
Modified Files:
src/sys/arch/hpc/stand/hpcboot: hpcboot.config
src/sys/arch/hpc/stand/libsa: libsa.config stand.h stricmp.cpp
strtok.cpp tolower.cpp winblk.c
src/sys/arch/hpc/stand/libz: libz.config
Added Files:
src/sys/arch/hpc/stand/libsa: dkcksum.c ufs.c
Log Message:
fix build failure.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpc/stand/hpcboot/hpcboot.config
cvs rdiff -u -r0 -r1.1 src/sys/arch/hpc/stand/libsa/dkcksum.c \
src/sys/arch/hpc/stand/libsa/ufs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpc/stand/libsa/libsa.config \
src/sys/arch/hpc/stand/libsa/winblk.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpc/stand/libsa/stand.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpc/stand/libsa/stricmp.cpp \
src/sys/arch/hpc/stand/libsa/tolower.cpp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpc/stand/libsa/strtok.cpp
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hpc/stand/libz/libz.config
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpc/stand/hpcboot/hpcboot.config
diff -u src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.12 src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.13
--- src/sys/arch/hpc/stand/hpcboot/hpcboot.config:1.12 Tue Apr 6 16:20:27 2010
+++ src/sys/arch/hpc/stand/hpcboot/hpcboot.config Fri Sep 23 16:00:15 2011
@@ -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='
.
Index: src/sys/arch/hpc/stand/libsa/libsa.config
diff -u src/sys/arch/hpc/stand/libsa/libsa.config:1.6 src/sys/arch/hpc/stand/libsa/libsa.config:1.7
--- src/sys/arch/hpc/stand/libsa/libsa.config:1.6 Wed Jan 18 01:04:04 2006
+++ src/sys/arch/hpc/stand/libsa/libsa.config Fri Sep 23 16:00:15 2011
@@ -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='
.
Index: src/sys/arch/hpc/stand/libsa/winblk.c
diff -u src/sys/arch/hpc/stand/libsa/winblk.c:1.6 src/sys/arch/hpc/stand/libsa/winblk.c:1.7
--- src/sys/arch/hpc/stand/libsa/winblk.c:1.6 Thu Jun 23 11:38:24 2011
+++ src/sys/arch/hpc/stand/libsa/winblk.c Fri Sep 23 16:00:15 2011
@@ -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));
Index: src/sys/arch/hpc/stand/libsa/stand.h
diff -u src/sys/arch/hpc/stand/libsa/stand.h:1.4 src/sys/arch/hpc/stand/libsa/stand.h:1.5
--- src/sys/arch/hpc/stand/libsa/stand.h:1.4 Wed Jan 25 18:28:26 2006
+++ src/sys/arch/hpc/stand/libsa/stand.h Fri Sep 23 16:00:15 2011
@@ -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"
Index: src/sys/arch/hpc/stand/libsa/stricmp.cpp
diff -u src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.3 src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.4
--- src/sys/arch/hpc/stand/libsa/stricmp.cpp:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpc/stand/libsa/stricmp.cpp Fri Sep 23 16:00:15 2011
@@ -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
-
Index: src/sys/arch/hpc/stand/libsa/tolower.cpp
diff -u src/sys/arch/hpc/stand/libsa/tolower.cpp:1.3 src/sys/arch/hpc/stand/libsa/tolower.cpp:1.4
--- src/sys/arch/hpc/stand/libsa/tolower.cpp:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpc/stand/libsa/tolower.cpp Fri Sep 23 16:00:15 2011
@@ -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
-
Index: src/sys/arch/hpc/stand/libsa/strtok.cpp
diff -u src/sys/arch/hpc/stand/libsa/strtok.cpp:1.2 src/sys/arch/hpc/stand/libsa/strtok.cpp:1.3
--- src/sys/arch/hpc/stand/libsa/strtok.cpp:1.2 Sun Dec 11 12:17:30 2005
+++ src/sys/arch/hpc/stand/libsa/strtok.cpp Fri Sep 23 16:00:15 2011
@@ -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>
Index: src/sys/arch/hpc/stand/libz/libz.config
diff -u src/sys/arch/hpc/stand/libz/libz.config:1.8 src/sys/arch/hpc/stand/libz/libz.config:1.9
--- src/sys/arch/hpc/stand/libz/libz.config:1.8 Wed Jan 18 00:11:27 2006
+++ src/sys/arch/hpc/stand/libz/libz.config Fri Sep 23 16:00:15 2011
@@ -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='
.
Added files:
Index: src/sys/arch/hpc/stand/libsa/dkcksum.c
diff -u /dev/null src/sys/arch/hpc/stand/libsa/dkcksum.c:1.1
--- /dev/null Fri Sep 23 16:00:16 2011
+++ src/sys/arch/hpc/stand/libsa/dkcksum.c Fri Sep 23 16:00:15 2011
@@ -0,0 +1,2 @@
+#include <stand.h>
+#include "../../../../lib/libsa/dkcksum.c"
Index: src/sys/arch/hpc/stand/libsa/ufs.c
diff -u /dev/null src/sys/arch/hpc/stand/libsa/ufs.c:1.1
--- /dev/null Fri Sep 23 16:00:16 2011
+++ src/sys/arch/hpc/stand/libsa/ufs.c Fri Sep 23 16:00:15 2011
@@ -0,0 +1,2 @@
+#include <stand.h>
+#include "../../../../lib/libsa/ufs.c"
