Thanks, pushed to master and branch-2.3.
On 4 December 2014 at 16:38, Jarno Rajahalme <[email protected]> wrote: > LGTM, > > Jarno > > Acked-by: Jarno Rajahalme <[email protected]> > > On Dec 4, 2014, at 4:26 PM, Joe Stringer <[email protected]> wrote: > >> Commit 526a7c85d11dc "util: Add be32_prefix_mask()." added an include for >> byte-order.h into util.h, which could cause link failures if users of >> libopenvswitch defined their own version of htonll(). Change the >> include, as only htonl() is needed and arpa/inet.h provides this. >> >> Signed-off-by: Joe Stringer <[email protected]> >> --- >> lib/util.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/lib/util.h b/lib/util.h >> index 8ef80c0..fa23ce5 100644 >> --- a/lib/util.h >> +++ b/lib/util.h >> @@ -17,6 +17,7 @@ >> #ifndef UTIL_H >> #define UTIL_H 1 >> >> +#include <arpa/inet.h> >> #include <inttypes.h> >> #include <limits.h> >> #include <stdarg.h> >> @@ -26,7 +27,6 @@ >> #include <stdio.h> >> #include <stdlib.h> >> #include <string.h> >> -#include "byte-order.h" >> #include "compiler.h" >> #include "openvswitch/types.h" >> #include "openvswitch/util.h" >> -- >> 1.7.10.4 >> > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
