Module Name: src
Committed By: tnozaki
Date: Sat Mar 27 22:14:10 UTC 2010
Modified Files:
src/include: wchar.h wctype.h
src/lib/libc/locale: iswctype_mb.c
src/sys/arch/alpha/include: ansi.h
src/sys/arch/amd64/include: ansi.h
src/sys/arch/arm/include: ansi.h
src/sys/arch/hppa/include: ansi.h
src/sys/arch/i386/include: ansi.h
src/sys/arch/ia64/include: ansi.h
src/sys/arch/m68k/include: ansi.h
src/sys/arch/mips/include: ansi.h
src/sys/arch/powerpc/include: ansi.h
src/sys/arch/sh3/include: ansi.h
src/sys/arch/sparc/include: ansi.h
src/sys/arch/sparc64/include: ansi.h
src/sys/arch/vax/include: ansi.h
src/sys/sys: ansi.h
Log Message:
1. {wctype,wctrans,mbstate}_t: switch MD to MI like other
libc implementation (such as *BSD and glibc2).
2. don't typedef void * wc{type,trans}_t, suggested by s...@-san.
it may pass through compiler type check, it's harmful.
so i introduce dummy struct __tag_wc{type,trans}_t(iconv_t already does).
no ABI change was made.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/include/wchar.h
cvs rdiff -u -r1.6 -r1.7 src/include/wctype.h
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/iswctype_mb.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/alpha/include/ansi.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/include/ansi.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/ansi.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/ansi.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/include/ansi.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/ansi.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/include/ansi.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/include/ansi.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/ansi.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sh3/include/ansi.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/include/ansi.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/include/ansi.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/include/ansi.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/ansi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/wchar.h
diff -u src/include/wchar.h:1.28 src/include/wchar.h:1.29
--- src/include/wchar.h:1.28 Sun Nov 15 22:21:03 2009
+++ src/include/wchar.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wchar.h,v 1.28 2009/11/15 22:21:03 christos Exp $ */
+/* $NetBSD: wchar.h,v 1.29 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -60,8 +60,8 @@
#include <sys/cdefs.h>
#include <sys/featuretest.h>
-#include <machine/ansi.h>
#include <machine/wchar_limits.h>
+#include <sys/ansi.h>
#include <sys/null.h>
#include <stdio.h> /* for FILE* */
Index: src/include/wctype.h
diff -u src/include/wctype.h:1.6 src/include/wctype.h:1.7
--- src/include/wctype.h:1.6 Thu Feb 3 04:39:32 2005
+++ src/include/wctype.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wctype.h,v 1.6 2005/02/03 04:39:32 perry Exp $ */
+/* $NetBSD: wctype.h,v 1.7 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -32,7 +32,7 @@
#define _WCTYPE_H_
#include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/ansi.h>
#ifdef _BSD_WINT_T_
typedef _BSD_WINT_T_ wint_t;
Index: src/lib/libc/locale/iswctype_mb.c
diff -u src/lib/libc/locale/iswctype_mb.c:1.5 src/lib/libc/locale/iswctype_mb.c:1.6
--- src/lib/libc/locale/iswctype_mb.c:1.5 Sun Jan 18 22:03:19 2009
+++ src/lib/libc/locale/iswctype_mb.c Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iswctype_mb.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $ */
+/* $NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: iswctype_mb.c,v 1.5 2009/01/18 22:03:19 tnozaki Exp $");
+__RCSID("$NetBSD: iswctype_mb.c,v 1.6 2010/03/27 22:14:09 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -130,7 +130,7 @@
return 0;
}
rl = _RUNE_LOCALE();
- te = (_WCTypeEntry const *)charclass;
+ te = (_WCTypeEntry const *)(void *)charclass;
return _iswctype_priv(rl, wc, te);
}
@@ -145,7 +145,7 @@
return wc;
}
rl = _RUNE_LOCALE();
- te = (_WCTransEntry const *)charmap;
+ te = (_WCTransEntry const *)(void *)charmap;
return _towctrans_priv(rl, wc, te);
}
Index: src/sys/arch/alpha/include/ansi.h
diff -u src/sys/arch/alpha/include/ansi.h:1.22 src/sys/arch/alpha/include/ansi.h:1.23
--- src/sys/arch/alpha/include/ansi.h:1.22 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/alpha/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.22 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.23 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -68,17 +68,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/amd64/include/ansi.h
diff -u src/sys/arch/amd64/include/ansi.h:1.8 src/sys/arch/amd64/include/ansi.h:1.9
--- src/sys/arch/amd64/include/ansi.h:1.8 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/amd64/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.8 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.9 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -65,18 +65,6 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#else /* !__x86_64__ */
Index: src/sys/arch/arm/include/ansi.h
diff -u src/sys/arch/arm/include/ansi.h:1.11 src/sys/arch/arm/include/ansi.h:1.12
--- src/sys/arch/arm/include/ansi.h:1.11 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/arm/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.11 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.12 2010/03/27 22:14:09 tnozaki Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -63,17 +63,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/hppa/include/ansi.h
diff -u src/sys/arch/hppa/include/ansi.h:1.11 src/sys/arch/hppa/include/ansi.h:1.12
--- src/sys/arch/hppa/include/ansi.h:1.11 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/hppa/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.11 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.12 2010/03/27 22:14:09 tnozaki Exp $ */
/* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */
@@ -64,17 +64,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- double __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/i386/include/ansi.h
diff -u src/sys/arch/i386/include/ansi.h:1.23 src/sys/arch/i386/include/ansi.h:1.24
--- src/sys/arch/i386/include/ansi.h:1.23 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/i386/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.23 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.24 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -63,17 +63,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _I386_ANSI_H_ */
Index: src/sys/arch/ia64/include/ansi.h
diff -u src/sys/arch/ia64/include/ansi.h:1.6 src/sys/arch/ia64/include/ansi.h:1.7
--- src/sys/arch/ia64/include/ansi.h:1.6 Sun Jan 11 02:45:45 2009
+++ src/sys/arch/ia64/include/ansi.h Sat Mar 27 22:14:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.6 2009/01/11 02:45:45 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.7 2010/03/27 22:14:09 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -73,16 +73,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/m68k/include/ansi.h
diff -u src/sys/arch/m68k/include/ansi.h:1.21 src/sys/arch/m68k/include/ansi.h:1.22
--- src/sys/arch/m68k/include/ansi.h:1.21 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/m68k/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.21 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.22 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -62,17 +62,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/mips/include/ansi.h
diff -u src/sys/arch/mips/include/ansi.h:1.26 src/sys/arch/mips/include/ansi.h:1.27
--- src/sys/arch/mips/include/ansi.h:1.26 Mon Dec 14 20:42:12 2009
+++ src/sys/arch/mips/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.26 2009/12/14 20:42:12 matt Exp $ */
+/* $NetBSD: ansi.h,v 1.27 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -68,17 +68,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/powerpc/include/ansi.h
diff -u src/sys/arch/powerpc/include/ansi.h:1.27 src/sys/arch/powerpc/include/ansi.h:1.28
--- src/sys/arch/powerpc/include/ansi.h:1.27 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/powerpc/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.27 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.28 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -74,17 +74,5 @@
#endif
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/sh3/include/ansi.h
diff -u src/sys/arch/sh3/include/ansi.h:1.13 src/sys/arch/sh3/include/ansi.h:1.14
--- src/sys/arch/sh3/include/ansi.h:1.13 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/sh3/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.13 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.14 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -61,17 +61,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/sparc/include/ansi.h
diff -u src/sys/arch/sparc/include/ansi.h:1.21 src/sys/arch/sparc/include/ansi.h:1.22
--- src/sys/arch/sparc/include/ansi.h:1.21 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/sparc/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.21 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.22 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -62,17 +62,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/sparc64/include/ansi.h
diff -u src/sys/arch/sparc64/include/ansi.h:1.15 src/sys/arch/sparc64/include/ansi.h:1.16
--- src/sys/arch/sparc64/include/ansi.h:1.15 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/sparc64/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.15 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.16 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -62,17 +62,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/arch/vax/include/ansi.h
diff -u src/sys/arch/vax/include/ansi.h:1.24 src/sys/arch/vax/include/ansi.h:1.25
--- src/sys/arch/vax/include/ansi.h:1.24 Sun Jan 11 02:45:46 2009
+++ src/sys/arch/vax/include/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.24 2009/01/11 02:45:46 christos Exp $ */
+/* $NetBSD: ansi.h,v 1.25 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -65,17 +65,5 @@
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_WINT_T_ int /* wint_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ void * /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef union {
- __int64_t __mbstateL; /* for alignment */
- char __mbstate8[128];
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#endif /* _ANSI_H_ */
Index: src/sys/sys/ansi.h
diff -u src/sys/sys/ansi.h:1.12 src/sys/sys/ansi.h:1.13
--- src/sys/sys/ansi.h:1.12 Mon Apr 28 20:24:10 2008
+++ src/sys/sys/ansi.h Sat Mar 27 22:14:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.12 2008/04/28 20:24:10 martin Exp $ */
+/* $NetBSD: ansi.h,v 1.13 2010/03/27 22:14:10 tnozaki Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _SYS_ANSI_H_
#define _SYS_ANSI_H_
-#include <machine/int_types.h>
+#include <machine/ansi.h>
typedef char * __caddr_t; /* core address */
typedef __uint32_t __gid_t; /* group id */
@@ -47,4 +47,23 @@
typedef __uint64_t __fsblkcnt_t; /* fs block count (statvfs) */
typedef __uint64_t __fsfilcnt_t; /* fs file count */
+struct __tag_wctrans_t;
+typedef struct __tag_wctrans_t *__wctrans_t;
+
+struct __tag_wctype_t;
+typedef struct __tag_wctype_t *__wctype_t;
+
+/*
+ * mbstate_t is an opaque object to keep conversion state, during multibyte
+ * stream conversions. The content must not be referenced by user programs.
+ */
+typedef union {
+ __int64_t __mbstateL; /* for alignment */
+ char __mbstate8[128];
+} __mbstate_t;
+
+#define _BSD_WCTRANS_T_ __wctrans_t /* wctrans_t */
+#define _BSD_WCTYPE_T_ __wctype_t /* wctype_t */
+#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
+
#endif /* !_SYS_ANSI_H_ */
