reverse a previous patch

a next version of the patch will follow
This commit is contained in:
seyko 2015-10-17 15:32:33 +03:00
parent 285292992f
commit ad524bb6c7

View File

@ -1621,6 +1621,7 @@ ST_FUNC void preprocess(int is_bof)
for (i = -2; i < n; ++i) { for (i = -2; i < n; ++i) {
char buf1[sizeof file->filename]; char buf1[sizeof file->filename];
CachedInclude *e; CachedInclude *e;
BufferedFile **f;
const char *path; const char *path;
if (i == -2) { if (i == -2) {
@ -1650,7 +1651,8 @@ ST_FUNC void preprocess(int is_bof)
pstrcat(buf1, sizeof(buf1), buf); pstrcat(buf1, sizeof(buf1), buf);
if (tok == TOK_INCLUDE_NEXT) 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 #ifdef INC_DEBUG
printf("%s: #include_next skipping %s\n", file->filename, buf1); printf("%s: #include_next skipping %s\n", file->filename, buf1);
#endif #endif