From ad524bb6c7de7134e1111343468949f74a19c0d8 Mon Sep 17 00:00:00 2001 From: seyko Date: Sat, 17 Oct 2015 15:32:33 +0300 Subject: [PATCH] reverse a previous patch a next version of the patch will follow --- tccpp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tccpp.c b/tccpp.c index 2564556f..7ec0d441 100644 --- a/tccpp.c +++ b/tccpp.c @@ -1621,6 +1621,7 @@ ST_FUNC void preprocess(int is_bof) for (i = -2; i < n; ++i) { char buf1[sizeof file->filename]; CachedInclude *e; + BufferedFile **f; const char *path; if (i == -2) { @@ -1650,7 +1651,8 @@ ST_FUNC void preprocess(int is_bof) pstrcat(buf1, sizeof(buf1), buf); if (tok == TOK_INCLUDE_NEXT) - if (0 == PATHCMP(file->filename, buf1)) { + for (f = s1->include_stack_ptr; f >= s1->include_stack; --f) + if (0 == PATHCMP((*f)->filename, buf1)) { #ifdef INC_DEBUG printf("%s: #include_next skipping %s\n", file->filename, buf1); #endif -- 2.11.4.GIT