From ee89ea7b477bb4fd05137de03b2e8443807ed9f4 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 12 Jul 2016 16:37:34 -0500 Subject: json: Move from lib to include/openvswitch. To easily allow both in- and out-of-tree building of the Python wrapper for the OVS JSON parser (e.g. w/ pip), move json.h to include/openvswitch. This also requires moving lib/{hmap,shash}.h. Both hmap.h and shash.h were #include-ing "util.h" even though the headers themselves did not use anything from there, but rather from include/openvswitch/util.h. Fixing that required including util.h in several C files mostly due to OVS_NOT_REACHED and things like xmalloc. Signed-off-by: Terry Wilson Signed-off-by: Ben Pfaff --- lib/pcap-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/pcap-file.c') diff --git a/lib/pcap-file.c b/lib/pcap-file.c index a850d217f..dd4d22930 100644 --- a/lib/pcap-file.c +++ b/lib/pcap-file.c @@ -25,10 +25,11 @@ #include "compiler.h" #include "dp-packet.h" #include "flow.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "packets.h" #include "timeval.h" #include "unaligned.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(pcap); -- cgit v1.2.1