From 6dc3492355aa9a8828874886f2d2359c58eb24e6 Mon Sep 17 00:00:00 2001 From: Idwer Vollering Date: Fri, 11 Aug 2017 11:53:34 +0200 Subject: util/cbmem, util/cbfstool: resolve macro errors on FreeBSD Using sys/cdefs.h would come to mind, however this include would not solve the build error. Built and runtime tested on FreeBSD 12.0-CURRENT, r322031 Change-Id: I6ec9bc7fea72aa69a41439e002f381bd5e5b6bc6 Signed-off-by: Idwer Vollering Reviewed-on: https://review.coreboot.org/20924 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- util/cbfstool/compiler.h | 4 ++++ util/cbmem/compiler.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h index a830239009..fc6a36b650 100644 --- a/util/cbfstool/compiler.h +++ b/util/cbfstool/compiler.h @@ -16,6 +16,8 @@ #ifndef __COMPILER_H__ #define __COMPILER_H__ +#if !defined(__FreeBSD__) + #if defined(__WIN32) || defined(__WIN64) #define __packed __attribute__((gcc_struct, packed)) #else @@ -23,6 +25,8 @@ #endif #define __aligned(x) __attribute__((aligned(x))) +#endif + #define __always_unused __attribute__((unused)) #define __must_check __attribute__((warn_unused_result)) diff --git a/util/cbmem/compiler.h b/util/cbmem/compiler.h index a830239009..fc6a36b650 100644 --- a/util/cbmem/compiler.h +++ b/util/cbmem/compiler.h @@ -16,6 +16,8 @@ #ifndef __COMPILER_H__ #define __COMPILER_H__ +#if !defined(__FreeBSD__) + #if defined(__WIN32) || defined(__WIN64) #define __packed __attribute__((gcc_struct, packed)) #else @@ -23,6 +25,8 @@ #endif #define __aligned(x) __attribute__((aligned(x))) +#endif + #define __always_unused __attribute__((unused)) #define __must_check __attribute__((warn_unused_result)) -- cgit v1.2.3