diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-11-28 17:56:29 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-11-28 17:56:29 +0100 |
| commit | 82992fed8c6426f431fa92933dcf4cfe4de926d6 (patch) | |
| tree | c7c3afb35248073d61d8863e635580f2969296e5 /lib/json.h | |
| parent | d7a64489f05d4bfba5e686aae941ef36eaa30688 (diff) | |
| parent | bf31fc8174b6d130b90e6ee1a67c543c3c8f1615 (diff) | |
Merge branch 'vtysh-grammar'
Conflicts:
isisd/isisd.c
lib/Makefile.am
lib/thread.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/json.h')
| -rw-r--r-- | lib/json.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/json.h b/lib/json.h index b217df0a7b..0ceffd4e8e 100644 --- a/lib/json.h +++ b/lib/json.h @@ -34,7 +34,7 @@ #define json_object_to_json_string_ext(A, B) json_object_to_json_string (A) #endif -extern int use_json(const int argc, const char *argv[]); +extern int use_json(const int argc, struct cmd_token *argv[]); extern void json_object_string_add(struct json_object* obj, const char *key, const char *s); extern void json_object_int_add(struct json_object* obj, const char *key, |