diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-06-16 19:48:16 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-06-16 19:48:16 +0000 |
| commit | 8811b910b092027f905013bced1da3e87c6b07b9 (patch) | |
| tree | b0c56a23f2d8877b9431deb3cab73df3c1913fb7 /source/compiler/prutils.c | |
| parent | 0c85196b0c51b4e5eba8fcace026f947f9112c9e (diff) | |
Notes
Diffstat (limited to 'source/compiler/prutils.c')
| -rw-r--r-- | source/compiler/prutils.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/compiler/prutils.c b/source/compiler/prutils.c index a802fcf3ca1b..d967e5cb19b8 100644 --- a/source/compiler/prutils.c +++ b/source/compiler/prutils.c @@ -382,6 +382,8 @@ PrPushInputFileStack ( PR_FILE_NODE *Fnode; + Gbl_HasIncludeFiles = TRUE; + /* Save the current state in an Fnode */ Fnode = UtLocalCalloc (sizeof (PR_FILE_NODE)); @@ -406,11 +408,11 @@ PrPushInputFileStack ( strcpy (Gbl_Files[ASL_FILE_INPUT].Filename, Filename); Gbl_Files[ASL_FILE_INPUT].Handle = InputFile; - Gbl_PreviousLineNumber = 0; - Gbl_CurrentLineNumber = 0; + Gbl_CurrentLineNumber = 1; /* Emit a new #line directive for the include file */ + Gbl_CurrentLineNumber = 1; FlPrintFile (ASL_FILE_PREPROCESSOR, "#line %u \"%s\"\n", 1, Filename); } @@ -460,12 +462,11 @@ PrPopInputFileStack ( Gbl_Files[ASL_FILE_INPUT].Filename = Fnode->Filename; Gbl_Files[ASL_FILE_INPUT].Handle = Fnode->File; Gbl_CurrentLineNumber = Fnode->CurrentLineNumber; - Gbl_PreviousLineNumber = 0; /* Emit a new #line directive after the include file */ FlPrintFile (ASL_FILE_PREPROCESSOR, "#line %u \"%s\"\n", - Gbl_CurrentLineNumber + 1, Fnode->Filename); + Gbl_CurrentLineNumber, Fnode->Filename); /* All done with this node */ |