diff options
author | Michael Brown <mcb30@ipxe.org> | 2014-10-15 14:45:17 +0100 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2014-10-16 14:12:42 +0100 |
commit | 318b5fca1a0602389b090785aada7783794076ab (patch) | |
tree | 97a2f7fad586e499339c95db8a681266b06ab008 /src/include/ipxe/efi/Base.h | |
parent | b9a5ff2b03b7354c9fafdca7e0e6c9b3da151f1c (diff) | |
download | ipxe-318b5fca1a0602389b090785aada7783794076ab.zip ipxe-318b5fca1a0602389b090785aada7783794076ab.tar.gz ipxe-318b5fca1a0602389b090785aada7783794076ab.tar.bz2 |
[efi] Update to current EDK2 headers
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/efi/Base.h')
-rw-r--r-- | src/include/ipxe/efi/Base.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/include/ipxe/efi/Base.h b/src/include/ipxe/efi/Base.h index c75a7ae..844f428 100644 --- a/src/include/ipxe/efi/Base.h +++ b/src/include/ipxe/efi/Base.h @@ -81,21 +81,20 @@ VERIFY_SIZE_OF (CHAR16, 2); #endif // -// For symbol name in GNU assembly code, an extra "_" is necessary +// For symbol name in assembly code, an extra "_" is sometimes necessary // -#if defined(__GNUC__) - /// - /// Private worker functions for ASM_PFX() - /// - #define _CONCATENATE(a, b) __CONCATENATE(a, b) - #define __CONCATENATE(a, b) a ## b - /// - /// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix - /// on symbols in assembly language. - /// - #define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name) -#endif +/// +/// Private worker functions for ASM_PFX() +/// +#define _CONCATENATE(a, b) __CONCATENATE(a, b) +#define __CONCATENATE(a, b) a ## b + +/// +/// The __USER_LABEL_PREFIX__ macro predefined by GNUC represents the prefix +/// on symbols in assembly language. +/// +#define ASM_PFX(name) _CONCATENATE (__USER_LABEL_PREFIX__, name) #if __APPLE__ // |