summaryrefslogtreecommitdiff
path: root/compiler/aslerror.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-07-06 17:18:05 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-07-06 17:18:05 +0000
commit6d31afa8e3ab79bfa6c97c341af73f4fc093351a (patch)
tree514e3ade7be23ac83127870abf009b5e5ae1d36f /compiler/aslerror.c
parentf2bf96d30fe08965ffd53a28099131ac030e43d5 (diff)
Notes
Diffstat (limited to 'compiler/aslerror.c')
-rw-r--r--compiler/aslerror.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/compiler/aslerror.c b/compiler/aslerror.c
index 4b9a04fa57cf..ff24e62b7aa9 100644
--- a/compiler/aslerror.c
+++ b/compiler/aslerror.c
@@ -280,7 +280,14 @@ AePrintException (
/* Get the file handles */
OutputFile = Gbl_Files[FileId].Handle;
+
+ /* Use the merged header/source file if present, otherwise use input file */
+
SourceFile = Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Handle;
+ if (!SourceFile)
+ {
+ SourceFile = Gbl_Files[ASL_FILE_INPUT].Handle;
+ }
if (Header)
{