summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorFrans Hendriks <fhendriks@eltan.com>2018-07-05 11:47:49 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-07-06 13:10:27 +0000
commit69a835d3117e57fa8f3df38b961997a2550218ae (patch)
tree6716b0830ccf9599a786b6e18281ef77bd2724a2 /util
parent8889e0106db85656857d44a56b13a6eec6192013 (diff)
downloadcoreboot-69a835d3117e57fa8f3df38b961997a2550218ae.tar.xz
util/cbfstool/compiler: __attribute redefinition
In Windows Cygwin enviroment, compiler reports redefinition error at cbfstool/ifwitool.c on _packed and __aligned. Skip new defines when vales are already defined. Change-Id: I3af3c6b8fc57eee345afcef2f871b897138f78ce Signed-off-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-on: https://review.coreboot.org/27357 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util')
-rw-r--r--util/cbfstool/compiler.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h
index fc6a36b650..cf043d5893 100644
--- a/util/cbfstool/compiler.h
+++ b/util/cbfstool/compiler.h
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright 2017 Google Inc.
+ * Copyright (c) 2017-2018 Eltan B.V.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,14 +19,18 @@
#if !defined(__FreeBSD__)
+#if !defined(__packed)
#if defined(__WIN32) || defined(__WIN64)
#define __packed __attribute__((gcc_struct, packed))
#else
#define __packed __attribute__((packed))
#endif
+#endif
+#if !defined(__aligned)
#define __aligned(x) __attribute__((aligned(x)))
#endif
+#endif
#define __always_unused __attribute__((unused))
#define __must_check __attribute__((warn_unused_result))