[coreboot-gerrit] Change in coreboot[master]: util/cbfstool/compiler: __attribute redefinition

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/27357 )

Change subject: util/cbfstool/compiler: __attribute redefinition
......................................................................

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 at eltan.com>
Reviewed-on: https://review.coreboot.org/27357
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi at google.com>
---
M util/cbfstool/compiler.h
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved



diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h
index fc6a36b..cf043d5 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))

-- 
To view, visit https://review.coreboot.org/27357
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3af3c6b8fc57eee345afcef2f871b897138f78ce
Gerrit-Change-Number: 27357
Gerrit-PatchSet: 2
Gerrit-Owner: Frans Hendriks <fhendriks at eltan.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180706/2307db54/attachment.html>