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 /lib/nx-match.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 'lib/nx-match.c')
| -rw-r--r-- | lib/nx-match.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/nx-match.c b/lib/nx-match.c index 505c6f9bc..c71ff0d64 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -22,7 +22,7 @@ #include "classifier.h" #include "colors.h" -#include "hmap.h" +#include "openvswitch/hmap.h" #include "openflow/nicira-ext.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/meta-flow.h" @@ -32,7 +32,7 @@ #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "packets.h" -#include "shash.h" +#include "openvswitch/shash.h" #include "tun-metadata.h" #include "unaligned.h" #include "util.h" |