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 /ofproto/ofproto.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 'ofproto/ofproto.c')
| -rw-r--r-- | ofproto/ofproto.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 5f84aa181..dcb0a0847 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -31,7 +31,7 @@ #include "coverage.h" #include "dp-packet.h" #include "hash.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "netdev.h" #include "nx-match.h" #include "ofproto.h" @@ -54,7 +54,7 @@ #include "poll-loop.h" #include "random.h" #include "seq.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "simap.h" #include "smap.h" #include "sset.h" @@ -62,6 +62,7 @@ #include "tun-metadata.h" #include "unaligned.h" #include "unixctl.h" +#include "util.h" VLOG_DEFINE_THIS_MODULE(ofproto); |