diff options
| author | drochner <drochner@NetBSD.org> | 2007-09-03 20:31:56 +0000 |
|---|---|---|
| committer | drochner <drochner@NetBSD.org> | 2007-09-03 20:31:56 +0000 |
| commit | dce09ea075e7ccf159daf76d125877c3bbea22c0 (patch) | |
| tree | 2a1212ac4f13469a8fd8f47fac054eb4c3306f8a | |
| parent | dc25cf6f51a0226d34d74aef508a7890ecb9704f (diff) | |
clean up some definitions around rune_t which are not needed anymore
| -rw-r--r-- | lib/libc/locale/rune.h | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/amd64/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/arm/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/hppa/include/ansi.h | 18 | ||||
| -rw-r--r-- | sys/arch/i386/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/ia64/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/m68k/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/mips/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/pc532/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/sh3/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/sparc/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/ansi.h | 21 | ||||
| -rw-r--r-- | sys/arch/vax/include/ansi.h | 21 |
15 files changed, 15 insertions, 279 deletions
diff --git a/lib/libc/locale/rune.h b/lib/libc/locale/rune.h index 065e330983e..e9f6124c60a 100644 --- a/lib/libc/locale/rune.h +++ b/lib/libc/locale/rune.h @@ -1,4 +1,4 @@ -/* $NetBSD: rune.h,v 1.11 2006/02/16 19:19:49 tnozaki Exp $ */ +/* $NetBSD: rune.h,v 1.12 2007/09/03 20:31:56 drochner Exp $ */ /*- * Copyright (c) 1993 @@ -73,7 +73,6 @@ * Other namespace conversion. */ -#define rune_t __nbrune_t #define _RUNE_ISCACHED _NB_RUNE_ISCACHED #define _CACHED_RUNES _NB_CACHED_RUNES #define _DEFAULT_INVALID_RUNE _NB_DEFAULT_INVALID_RUNE diff --git a/sys/arch/alpha/include/ansi.h b/sys/arch/alpha/include/ansi.h index 6bdb56aa88c..c2e16eb746f 100644 --- a/sys/arch/alpha/include/ansi.h +++ b/sys/arch/alpha/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.19 2006/10/04 13:51:59 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.20 2007/09/03 20:31:56 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -66,27 +66,8 @@ typedef struct { #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/amd64/include/ansi.h b/sys/arch/amd64/include/ansi.h index 386218aeb2c..60de27ca0ec 100644 --- a/sys/arch/amd64/include/ansi.h +++ b/sys/arch/amd64/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.4 2006/10/04 13:51:59 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.5 2007/09/03 20:31:56 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -61,27 +61,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/arm/include/ansi.h b/sys/arch/arm/include/ansi.h index 7452ae81de7..4feb78bfb2d 100644 --- a/sys/arch/arm/include/ansi.h +++ b/sys/arch/arm/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.7 2006/10/04 13:51:59 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.8 2007/09/03 20:31:56 drochner Exp $ */ /* * Copyright (c) 1990, 1993 @@ -69,27 +69,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/hppa/include/ansi.h b/sys/arch/hppa/include/ansi.h index ece4d055d2f..a77551c8c1c 100644 --- a/sys/arch/hppa/include/ansi.h +++ b/sys/arch/hppa/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.7 2006/10/04 13:51:59 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.8 2007/09/03 20:31:57 drochner Exp $ */ /* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */ @@ -62,24 +62,8 @@ #define _BSD_TIMER_T_ int #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/i386/include/ansi.h b/sys/arch/i386/include/ansi.h index afd264486c8..422a9dc0165 100644 --- a/sys/arch/i386/include/ansi.h +++ b/sys/arch/i386/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.19 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.20 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -61,27 +61,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/ia64/include/ansi.h b/sys/arch/ia64/include/ansi.h index 37d25e58632..9c522dea6f2 100644 --- a/sys/arch/ia64/include/ansi.h +++ b/sys/arch/ia64/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.3 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.4 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -71,27 +71,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ /* diff --git a/sys/arch/m68k/include/ansi.h b/sys/arch/m68k/include/ansi.h index bdbc587b389..25634af23a1 100644 --- a/sys/arch/m68k/include/ansi.h +++ b/sys/arch/m68k/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.18 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.19 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -60,27 +60,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/mips/include/ansi.h b/sys/arch/mips/include/ansi.h index cf4320cf4a0..b991b32d3f9 100644 --- a/sys/arch/mips/include/ansi.h +++ b/sys/arch/mips/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.21 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.22 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -67,27 +67,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/pc532/include/ansi.h b/sys/arch/pc532/include/ansi.h index 93a18fce507..05cd79bfa89 100644 --- a/sys/arch/pc532/include/ansi.h +++ b/sys/arch/pc532/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.21 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.22 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -61,27 +61,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/powerpc/include/ansi.h b/sys/arch/powerpc/include/ansi.h index c107c9d19e1..22b818ec066 100644 --- a/sys/arch/powerpc/include/ansi.h +++ b/sys/arch/powerpc/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.23 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.24 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -71,27 +71,8 @@ typedef struct { char *__stack, *__base; } __va_list; #endif - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/sh3/include/ansi.h b/sys/arch/sh3/include/ansi.h index 2f59b9c946a..fbf5e94377d 100644 --- a/sys/arch/sh3/include/ansi.h +++ b/sys/arch/sh3/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.10 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.11 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -59,27 +59,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/sparc/include/ansi.h b/sys/arch/sparc/include/ansi.h index 5e69b074d87..42ac5b93ed9 100644 --- a/sys/arch/sparc/include/ansi.h +++ b/sys/arch/sparc/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.18 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.19 2007/09/03 20:31:57 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -60,27 +60,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/sparc64/include/ansi.h b/sys/arch/sparc64/include/ansi.h index 14b7ac389fa..89dd6ab113a 100644 --- a/sys/arch/sparc64/include/ansi.h +++ b/sys/arch/sparc64/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.12 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.13 2007/09/03 20:31:58 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -60,27 +60,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ diff --git a/sys/arch/vax/include/ansi.h b/sys/arch/vax/include/ansi.h index 7af5d62e239..e032674b765 100644 --- a/sys/arch/vax/include/ansi.h +++ b/sys/arch/vax/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.20 2006/10/04 13:52:00 tnozaki Exp $ */ +/* $NetBSD: ansi.h,v 1.21 2007/09/03 20:31:58 drochner Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -71,27 +71,8 @@ #define _BSD_TIMER_T_ int /* timer_t */ #define _BSD_SUSECONDS_T_ int /* suseconds_t */ #define _BSD_USECONDS_T_ unsigned int /* useconds_t */ - -/* - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. use wchar_t. - * - * Runes (wchar_t) is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you - * lose a bit of ANSI conformance, but your programs will still work. - * - * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t - * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains - * defined for ctype.h. - */ #define _BSD_WCHAR_T_ int /* wchar_t */ #define _BSD_WINT_T_ int /* wint_t */ -#define _BSD_RUNE_T_ int /* rune_t */ #define _BSD_WCTRANS_T_ void * /* wctrans_t */ #define _BSD_WCTYPE_T_ void * /* wctype_t */ |
