aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Newell <CraigN@ieee.org>2000-09-05 00:34:02 +0000
committerJason Merrill <jason@gcc.gnu.org>2000-09-04 20:34:02 -0400
commitaf7f0fde0bb653e030a04524b65c1b78d2e253db (patch)
tree4028d59e15a8652e04d6d8d0d8bd882d22f59ae3
parent9d40a6660ec161416823832e4ee72c327c87ae07 (diff)
downloadgcc-af7f0fde0bb653e030a04524b65c1b78d2e253db.zip
gcc-af7f0fde0bb653e030a04524b65c1b78d2e253db.tar.gz
gcc-af7f0fde0bb653e030a04524b65c1b78d2e253db.tar.bz2
* gcc.c: Undefine "__WCHAR_TYPE__" before redefining it.
From-SVN: r36146
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gcc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 535d698..674253d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-04 Craig Newell <CraigN@ieee.org>
+
+ * gcc.c: Undefine "__WCHAR_TYPE__" before redefining it.
+
2000-09-04 Andreas Schwab <schwab@suse.de>
* Makefile.in (STAGESTUFF): Remove libgcc.
diff --git a/gcc/gcc.c b/gcc/gcc.c
index c5378c4..7281fd7 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -564,7 +564,7 @@ static const char *cpp_options =
%{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
%{ffast-math:-D__FAST_MATH__}\
- %{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
+ %{fshort-wchar:-U__WCHAR_TYPE__ -D__WCHAR_TYPE__=short\\ unsigned\\ int}\
%{fshow-column} %{fno-show-column}\
%{fleading-underscore} %{fno-leading-underscore}\
%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z %i\