[PATCH 2/7] fwts_uefi.h: replace _Pragmas with abstracted pragma macros

Colin King colin.king at canonical.com
Mon Jul 30 18:30:54 UTC 2018


From: Colin Ian King <colin.king at canonical.com>

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/lib/include/fwts_uefi.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/include/fwts_uefi.h b/src/lib/include/fwts_uefi.h
index 686af8d2..1dc34a94 100644
--- a/src/lib/include/fwts_uefi.h
+++ b/src/lib/include/fwts_uefi.h
@@ -20,10 +20,8 @@
 #ifndef __FWTS_UEFI_H__
 #define __FWTS_UEFI_H__
 
-#if defined(__GNUC__) && (__GNUC__ > 7)
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wpacked-not-aligned\"")
-#endif
+PRAGMA_PUSH
+PRAGMA_PACK_WARN_OFF
 
 #define FWTS_UEFI_LOAD_OPTION_ACTIVE 		0x00000001
 #define FWTS_UEFI_LOAD_OPTION_FORCE_RECONNECT 	0x00000002
@@ -661,8 +659,6 @@ char *fwts_uefi_attribute_info(uint32_t attr);
 
 bool fwts_uefi_efivars_iface_exist(void);
 
-#if defined(__GNUC__) && (__GNUC__ > 7)
-_Pragma("GCC diagnostic pop")
-#endif
+PRAGMA_POP
 
 #endif
-- 
2.17.1




More information about the fwts-devel mailing list