diff options
| author | Warner Losh <imp@FreeBSD.org> | 2002-08-08 02:42:29 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2002-08-08 02:42:29 +0000 |
| commit | a705529fd647a8679df9249df131f674e1a35db7 (patch) | |
| tree | 67cd787015546db6efc16f001333f99c64f4d015 /include | |
| parent | ddd3c7e90b521328f02e4d31d55e32aa1cf7a1fb (diff) | |
Notes
Diffstat (limited to 'include')
| -rw-r--r-- | include/runetype.h | 3 | ||||
| -rw-r--r-- | include/wchar.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/runetype.h b/include/runetype.h index e7fdf5d74b11..d84be7daab2d 100644 --- a/include/runetype.h +++ b/include/runetype.h @@ -34,6 +34,7 @@ * SUCH DAMAGE. * * @(#)runetype.h 8.1 (Berkeley) 6/2/93 + * $FreeBSD$ */ #ifndef _RUNETYPE_H_ @@ -52,10 +53,12 @@ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ #endif +#ifndef __cplusplus #ifdef _BSD_WCHAR_T_ typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif +#endif #define _CACHED_RUNES (1 <<8 ) /* Must be a power of 2 */ #define _CRMASK (~(_CACHED_RUNES - 1)) diff --git a/include/wchar.h b/include/wchar.h index c14c1b785c2b..73d481fa3835 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -73,10 +73,12 @@ #define NULL 0 #endif +#ifndef __cplusplus #ifdef _BSD_WCHAR_T_ typedef _BSD_WCHAR_T_ wchar_t; #undef _BSD_WCHAR_T_ #endif +#endif #ifdef _BSD_MBSTATE_T_ typedef _BSD_MBSTATE_T_ mbstate_t; |