Don't define wchar_t if we are a C++ compiler.
PR: 31864, 40084
This commit is contained in:
parent
03fd39aa3d
commit
6087d2441e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=99640
@ -32,10 +32,12 @@
|
||||
#include <machine/_inttypes.h>
|
||||
#include <sys/stdint.h>
|
||||
|
||||
#ifndef __cplusplus
|
||||
#ifdef _BSD_WCHAR_T_
|
||||
typedef _BSD_WCHAR_T_ wchar_t;
|
||||
#undef _BSD_WCHAR_T_
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
intmax_t quot; /* Quotient. */
|
||||
|
@ -53,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))
|
||||
|
@ -55,10 +55,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
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
|
@ -53,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
|
||||
|
||||
typedef struct {
|
||||
int quot; /* quotient */
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user