Declare update_checksums always as static
authorTom Henderson <tomh@tomh.org>
Sat, 12 Mar 2016 14:43:03 -0800
changeset 3 4db95a8ea718
parent 2 bb2869a6bbe1
child 4 0c27f7c4155c
Declare update_checksums always as static This change was made necessary by g++-5, which started to include the update_checksums symbol in the libopenflow.a library, resulting in an 'undefined reference to update_checksums' error when linking to ns-3's openflow module.
switch/pt_act.c
--- a/switch/pt_act.c	Wed Jan 09 10:03:23 2013 -0800
+++ b/switch/pt_act.c	Sat Mar 12 14:43:03 2016 -0800
@@ -6,11 +6,7 @@
 #include "csum.h"
 #include "packets.h"
 
-#ifdef NS3
-void inline
-#else
 static void inline
-#endif
 update_checksums(struct ofpbuf *buffer, const struct sw_flow_key *key,
 				 uint32_t old_word, uint32_t new_word) {
     struct ip_header *nh = buffer->l3;