From e8fed7d01ca6fb6c7e96faf2b831fcfa4552cb4a Mon Sep 17 00:00:00 2001 From: William Tu Date: Wed, 17 Feb 2016 18:00:22 -0800 Subject: [PATCH] gcc: Fix compile errors due to anonymous union initilization. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit gcc 4.4.7 lets you initialize named fields, and assign to anonymous union members, but cannot statically initialize a named member of an anonymous union. This causes errors when doing make: fproto/fail-open.c: In function ‘send_bogus_packet_ins’: ofproto/fail-open.c:130: error: unknown field ‘pin’ specified in initializer ofproto/fail-open.c:131: error: unknown field ‘up’ specified in initializer ofproto/fail-open.c:132: error: unknown field ‘packet’ specified in initializer ofproto/fail-open.c:132: warning: missing braces around initializer ofproto/fail-open.c:132: warning: (near initialization for ‘am..pin.up’) ofproto/fail-open.c:134: error: extra brace group at end of initializer Examaple: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42875 We can either assign a name to the union or, in this patch, remove the unnecessary union. Signed-off-by: William Tu Signed-off-by: Ben Pfaff --- ofproto/connmgr.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index c5992185d..f2e0a5f10 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -60,13 +60,11 @@ struct ofproto_async_msg { uint16_t controller_id; /* Controller ID to send to. */ enum ofputil_async_msg_type oam; - union { - /* OAM_PACKET_IN. */ - struct { - struct ofputil_packet_in_private up; - int max_len; /* From action, or -1 if none. */ - } pin; - }; + /* OAM_PACKET_IN. */ + struct { + struct ofputil_packet_in_private up; + int max_len; /* From action, or -1 if none. */ + } pin; }; void ofproto_async_msg_free(struct ofproto_async_msg *); -- 2.20.1