diff mbox series

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

Message ID 20180730183059.28039-3-colin.king@canonical.com
State Accepted
Headers show
Series abstract _Pragmas and minor changes to build with gcc and clang | expand

Commit Message

Colin Ian King July 30, 2018, 6:30 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

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

Comments

Alex Hung July 31, 2018, 12:11 a.m. UTC | #1 
On 2018-07-30 11:30 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Signed-off-by: Colin Ian King <colin.king@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
> 


Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu July 31, 2018, 7:48 a.m. UTC | #2 
On 07/31/2018 02:30 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Colin Ian King <colin.king@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
Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox series

Patch

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