<p>Frans Hendriks has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/cbfstool/compiler: __attribute redefinition<br><br>In Windows Cygwin enviroment, compiler reports<br>redefinition error at cbfstool/ifwitool.c<br>on _packed and __aligned.<br><br>Skip new defines when vales are already defined.<br><br>Change-Id: I3af3c6b8fc57eee345afcef2f871b897138f78ce<br>Signed-off-by: Frans Hendriks <fhendriks@eltan.com><br>---<br>M util/cbfstool/compiler.h<br>1 file changed, 5 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/27357/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/compiler.h b/util/cbfstool/compiler.h</span><br><span>index fc6a36b..cf043d5 100644</span><br><span>--- a/util/cbfstool/compiler.h</span><br><span>+++ b/util/cbfstool/compiler.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span>  * This file is part of the coreboot project.</span><br><span>  *</span><br><span>  * Copyright 2017 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (c) 2017-2018 Eltan B.V.</span><br><span>  *</span><br><span>  * This program is free software; you can redistribute it and/or modify</span><br><span>  * it under the terms of the GNU General Public License as published by</span><br><span>@@ -18,14 +19,18 @@</span><br><span> </span><br><span> #if !defined(__FreeBSD__)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if !defined(__packed)</span><br><span> #if defined(__WIN32) || defined(__WIN64)</span><br><span> #define __packed __attribute__((gcc_struct, packed))</span><br><span> #else</span><br><span> #define __packed __attribute__((packed))</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if !defined(__aligned)</span><br><span> #define __aligned(x) __attribute__((aligned(x)))</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #define __always_unused __attribute__((unused))</span><br><span> #define __must_check __attribute__((warn_unused_result))</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27357">change 27357</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27357"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3af3c6b8fc57eee345afcef2f871b897138f78ce </div>
<div style="display:none"> Gerrit-Change-Number: 27357 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Frans Hendriks <fhendriks@eltan.com> </div>