diff options
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/arc/include/arcfuncs.h | 12 | ||||
-rw-r--r-- | sys/boot/efi/include/ia64/efibind.h | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/boot/arc/include/arcfuncs.h b/sys/boot/arc/include/arcfuncs.h index e88ff03..13e4792 100644 --- a/sys/boot/arc/include/arcfuncs.h +++ b/sys/boot/arc/include/arcfuncs.h @@ -27,7 +27,14 @@ * */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifndef _ARCFUNCS_H +#define _ARCFUNCS_H + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +#ifdef __CC_SUPPORTS_INLINE #define INLINE inline #else #define INLINE /**/ @@ -197,3 +204,6 @@ VND_FN(3, u_int32_t, Print, VND_FN(4, void, ReturnExtendedSystemInformation, (EXTENDED_SYSTEM_INFORMATION *SystemInfo), (SystemInfo)) + +#endif /* _ARGFUNCS_H */ + diff --git a/sys/boot/efi/include/ia64/efibind.h b/sys/boot/efi/include/ia64/efibind.h index 73f3469..07883b8 100644 --- a/sys/boot/efi/include/ia64/efibind.h +++ b/sys/boot/efi/include/ia64/efibind.h @@ -18,8 +18,6 @@ Revision History --*/ -#pragma pack() - #include <sys/stdint.h> /* Basic EFI types of various widths. */ @@ -142,7 +140,7 @@ void __mf (void); #ifdef NO_INTERFACE_DECL #define INTERFACE_DECL(x) #else -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS_FORWARD_REFERENCE_CONSTRUCT #define INTERFACE_DECL(x) struct x #else #define INTERFACE_DECL(x) typedef struct x |