aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNeil Booth <neil@gcc.gnu.org>2000-11-21 18:27:49 +0000
committerNeil Booth <neil@gcc.gnu.org>2000-11-21 18:27:49 +0000
commit3fc786a446fd8888598c0a4537c5ba7b39fe039b (patch)
tree2ee6e22cbd1c413796d31b84acf380f9bbcb04ef /gcc
parent847dde9555b9dc852d1de2678c99496b498446cc (diff)
downloadgcc-3fc786a446fd8888598c0a4537c5ba7b39fe039b.zip
gcc-3fc786a446fd8888598c0a4537c5ba7b39fe039b.tar.gz
gcc-3fc786a446fd8888598c0a4537c5ba7b39fe039b.tar.bz2
* do_includes: Revert to using cpp_read_file.
From-SVN: r37620
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cppinit.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index f8394e4..6242840 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -937,16 +937,11 @@ do_includes (pfile, p, scan)
{
while (p)
{
- cpp_token header;
struct pending_option *q;
- header.type = CPP_STRING;
- header.val.str.text = (unsigned char *) p->arg;
- header.val.str.len = strlen (p->arg);
-
- /* Use the #include "" search path. */
- _cpp_execute_include (pfile, &header, 0, 0);
- if (scan)
+ /* Later: maybe update this to use the #include "" search path
+ if cpp_read_file fails. */
+ if (cpp_read_file (pfile, p->arg) && scan)
cpp_scan_buffer_nooutput (pfile);
q = p->next;
free (p);