From 0b3612631f49ba0c008635aaa46ecf8be2eefcf7 Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Fri, 20 Nov 2015 12:05:55 +0100
Subject: tccpp: cleanup #include_next

tcc_normalize_inc_dirs: normally no problem to be absolutly
gcc compatible as long as it can be done the tiny way.

This reverts to the state before recent related commits and
reimplements a (small) part of it to fix the reported problem.


Also: Revert "parsing "..." sequence"
c3975cf27c792d493e76a2058a1eaf588324053e

	&& p[1] == '.'

is not a reliable way to lookahead
---
 tcc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tcc.h')

diff --git a/tcc.h b/tcc.h
index 06b80fe..05e3965 100644
--- a/tcc.h
+++ b/tcc.h
@@ -536,10 +536,10 @@ typedef struct BufferedFile {
     struct BufferedFile *prev;
     int line_num;    /* current line number - here to simplify code */
     int line_ref;    /* tcc -E: last printed line */
-    int inc_path_index;
     int ifndef_macro;  /* #ifndef macro / #endif search */
     int ifndef_macro_saved; /* saved ifndef_macro */
     int *ifdef_stack_ptr; /* ifdef_stack value at the start of the file */
+    int include_next_index; /* next search path */
     char filename[1024];    /* filename */
     unsigned char unget[4];
     unsigned char buffer[1]; /* extra size for CH_EOB char */
-- 
cgit v1.3.1