summaryrefslogtreecommitdiff
path: root/vtep
diff options
context:
space:
mode:
authorTerry Wilson <twilson@redhat.com>2016-07-12 16:37:34 -0500
committerBen Pfaff <blp@ovn.org>2016-07-22 17:09:17 -0700
commitee89ea7b477bb4fd05137de03b2e8443807ed9f4 (patch)
treec67229de600aa075cc7326419b50e76a8eecb032 /vtep
parentab39371d68842b7e4000cc5d8718e6fc04e92795 (diff)
downloadopenvswitch-ee89ea7b477bb4fd05137de03b2e8443807ed9f4.tar.gz
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 <twilson@redhat.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'vtep')
-rw-r--r--vtep/vtep-ctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vtep/vtep-ctl.c b/vtep/vtep-ctl.c
index 759150f1d..245ba0db1 100644
--- a/vtep/vtep-ctl.c
+++ b/vtep/vtep-ctl.c
@@ -34,7 +34,7 @@
#include "openvswitch/dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
-#include "json.h"
+#include "openvswitch/json.h"
#include "ovsdb-data.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"