diff options
| author | Terry Wilson <twilson@redhat.com> | 2016-07-12 16:37:34 -0500 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-07-22 17:09:17 -0700 |
| commit | ee89ea7b477bb4fd05137de03b2e8443807ed9f4 (patch) | |
| tree | c67229de600aa075cc7326419b50e76a8eecb032 /ovsdb/jsonrpc-server.c | |
| parent | ab39371d68842b7e4000cc5d8718e6fc04e92795 (diff) | |
| download | openvswitch-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 'ovsdb/jsonrpc-server.c')
| -rw-r--r-- | ovsdb/jsonrpc-server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 864fb0309..bde912227 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -23,7 +23,7 @@ #include "column.h" #include "openvswitch/dynamic-string.h" #include "monitor.h" -#include "json.h" +#include "openvswitch/json.h" #include "jsonrpc.h" #include "ovsdb-error.h" #include "ovsdb-parser.h" @@ -39,6 +39,7 @@ #include "timeval.h" #include "transaction.h" #include "trigger.h" +#include "util.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ovsdb_jsonrpc_server); |