aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2002-07-09 05:13:30 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2002-07-09 05:13:30 +0000
commit6087d2441e53d0dce1541ce9554e45c0167167d7 (patch)
treeacf420f0bef7948cce43fcfad7ad487a88949648
parent03fd39aa3db056d44cff63fd6d3adbcfe4334a19 (diff)
downloadsrc-6087d2441e53d0dce1541ce9554e45c0167167d7.tar.gz
src-6087d2441e53d0dce1541ce9554e45c0167167d7.zip
Don't define wchar_t if we are a C++ compiler.
PR: 31864, 40084
Notes
Notes: svn path=/head/; revision=99640
-rw-r--r--include/inttypes.h2
-rw-r--r--include/runetype.h2
-rw-r--r--include/stddef.h2
-rw-r--r--include/stdlib.h2
-rw-r--r--include/wchar.h2
5 files changed, 10 insertions, 0 deletions
diff --git a/include/inttypes.h b/include/inttypes.h
index 6efcd817f72a..cd59bedb90f2 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -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. */
diff --git a/include/runetype.h b/include/runetype.h
index a5f136e070c6..4ddd95d92320 100644
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -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))
diff --git a/include/stddef.h b/include/stddef.h
index feb1cdc984bb..1e8dd2e36055 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -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
diff --git a/include/stdlib.h b/include/stdlib.h
index d41ccc8d2a97..f22f1e1d70ab 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -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 */
diff --git a/include/wchar.h b/include/wchar.h
index a27fc54484b5..df77b41baf46 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;