diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-18 01:36:21 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-18 01:36:21 +0200 |
| commit | e52702f29d003585dcfbb4914b2a52d77a177739 (patch) | |
| tree | 3e130ded38c48316796bfb602dc6fe6d119129d2 /lib/json.h | |
| parent | ospf6d: fix a few vty help strings (diff) | |
| parent | vtysh: fix build failure in vtysh_writeconfig_integrated() (diff) | |
| download | frr-e52702f29d003585dcfbb4914b2a52d77a177739.tar.xz frr-e52702f29d003585dcfbb4914b2a52d77a177739.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgp_vty.c
isisd/isis_redist.c
isisd/isis_routemap.c
isisd/isis_vty.c
isisd/isisd.c
lib/command.c
lib/distribute.c
lib/if.c
lib/keychain.c
lib/routemap.c
lib/routemap.h
ospf6d/ospf6_asbr.c
ospf6d/ospf6_interface.c
ospf6d/ospf6_neighbor.c
ospf6d/ospf6_top.c
ospf6d/ospf6_zebra.c
ospf6d/ospf6d.c
ospfd/ospf_routemap.c
ospfd/ospf_vty.c
ripd/rip_routemap.c
ripngd/ripng_routemap.c
vtysh/extract.pl.in
vtysh/vtysh.c
zebra/interface.c
zebra/irdp_interface.c
zebra/rt_netlink.c
zebra/rtadv.c
zebra/test_main.c
zebra/zebra_routemap.c
zebra/zebra_vty.c
Diffstat (limited to 'lib/json.h')
| -rw-r--r-- | lib/json.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/json.h b/lib/json.h index 3fcfe340e..e3d73d9d8 100644 --- a/lib/json.h +++ b/lib/json.h @@ -26,6 +26,12 @@ #include <json-c/json.h> #else #include <json/json.h> + +/* + * json_object_to_json_string_ext is only available for json-c + * so let's just turn it back to the original usage. + */ +#define json_object_to_json_string_ext(A, B) json_object_to_json_string (A) #endif extern int use_json(const int argc, struct cmd_token *argv[]); |