diff options
| author | jkim <jkim@FreeBSD.org> | 2010-07-06 17:18:05 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-07-06 17:18:05 +0000 |
| commit | 9ef1b91c0f59a1a15565c354b3e372ab265c7b5a (patch) | |
| tree | 514e3ade7be23ac83127870abf009b5e5ae1d36f /compiler/aslerror.c | |
| parent | d54ec0eced2867779a0ed7f3c8043be7a3325934 (diff) | |
| download | FreeBSD-src-9ef1b91c0f59a1a15565c354b3e372ab265c7b5a.zip FreeBSD-src-9ef1b91c0f59a1a15565c354b3e372ab265c7b5a.tar.gz | |
Import ACPICA 20100702.
Diffstat (limited to 'compiler/aslerror.c')
| -rw-r--r-- | compiler/aslerror.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/compiler/aslerror.c b/compiler/aslerror.c index 4b9a04f..ff24e62 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) { |
