ofp-actions: Fix build on earlier GCC.
authorJoe Stringer <joestringer@nicira.com>
Fri, 16 Oct 2015 22:31:59 +0000 (15:31 -0700)
committerJoe Stringer <joestringer@nicira.com>
Fri, 16 Oct 2015 23:17:13 +0000 (16:17 -0700)
GCC4.4 gets confused by anonymous fields + flexible fields, complains:
lib/ofp-actions.h:510: error: flexible array member in otherwise empty
struct
lib/ofp-actions.h:512: error: bit-field ‘build_assert_failed’ width not
an integer constant
lib/ofp-actions.h:514: error: bit-field ‘build_assert_failed’ width not
an integer constant

Fix the problem by specifying the actions length as zero.

Reported-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
lib/ofp-actions.h

index 0ad2e3f..773b617 100644 (file)
@@ -507,7 +507,7 @@ struct ofpact_conntrack {
         CT_MEMBERS;
         uint8_t pad[OFPACT_ALIGN(sizeof(CT_MEMBERS))];
     };
-    struct ofpact actions[];
+    struct ofpact actions[0];
 };
 BUILD_ASSERT_DECL(offsetof(struct ofpact_conntrack, actions)
                   % OFPACT_ALIGNTO == 0);