aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppinit.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d525421..0bb9646 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-11 Neil Booth <neil@daikokuya.demon.co.uk>
+
+ * cppinit.c (do_includes): Fix typo.
+
2001-01-11 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* config/m68hc11/m68hc11.md (cmphi_1): Make sure reloading
@@ -23,6 +27,7 @@
* cppinit.c (cpp_start_read): If -fpreprocessed, ignore
-D, -U and -A, and don't initialize the builtins.
+ (do_includes): Error if -include or -imacros with -fpreprocessed.
* cppmain.c (cb_define, cb_undef): Unconditionally process
the callback.
* tradcpp.c (main): Fix typo.
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index b7cbbf2..50896b8 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -851,7 +851,7 @@ do_includes (pfile, p, scan)
/* Don't handle if -fpreprocessed. Later: maybe update this to
use the #include "" search path if cpp_read_file fails. */
- if (! CPP_OPTION (pfile, preprocessed))
+ if (CPP_OPTION (pfile, preprocessed))
cpp_error (pfile, "-include and -imacros cannot be used with -fpreprocessed");
else if (_cpp_read_file (pfile, p->arg) && scan)
cpp_scan_buffer_nooutput (pfile, 0);