diff options
| author | Michael Brown | 2014-10-15 15:45:17 +0200 |
|---|---|---|
| committer | Michael Brown | 2014-10-16 15:12:42 +0200 |
| commit | 318b5fca1a0602389b090785aada7783794076ab (patch) | |
| tree | 97a2f7fad586e499339c95db8a681266b06ab008 /src/include/ipxe/efi/import.pl | |
| parent | [efi] Generalise snpnet_dev_info() to efi_device_info() (diff) | |
| download | ipxe-318b5fca1a0602389b090785aada7783794076ab.tar.gz ipxe-318b5fca1a0602389b090785aada7783794076ab.tar.xz ipxe-318b5fca1a0602389b090785aada7783794076ab.zip | |
[efi] Update to current EDK2 headers
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/efi/import.pl')
| -rwxr-xr-x | src/include/ipxe/efi/import.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/include/ipxe/efi/import.pl b/src/include/ipxe/efi/import.pl index 62ee750b2..f5a3f546f 100755 --- a/src/include/ipxe/efi/import.pl +++ b/src/include/ipxe/efi/import.pl @@ -78,9 +78,8 @@ sub try_import_file { # Write out line print $outfh "$_\n"; # Apply FILE_LICENCE() immediately after include guard - if ( defined $maybe_guard ) { + if ( defined $maybe_guard && ! defined $guard ) { if ( /^\#define\s+_?_${maybe_guard}_?_$/ ) { - die "Duplicate header guard detected in $infile\n" if $guard; $guard = $maybe_guard; print $outfh "\nFILE_LICENCE ( $licence );\n" if $licence; } |