diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 16:31:49 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 16:31:49 +0000 |
| commit | 0a538fc98fb662b4cf2d927ac29fd9af4a4fab03 (patch) | |
| tree | f6dbe2af92d44f9a77e4802cefb440811dd69584 /lib/command.h | |
| parent | e52702f29d003585dcfbb4914b2a52d77a177739 (diff) | |
| parent | 41246cb61418102f9f3bfa3e0acfce90c7798e67 (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
isisd/isis_routemap.c
zebra/rt_netlink.c
Diffstat (limited to 'lib/command.h')
| -rw-r--r-- | lib/command.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/command.h b/lib/command.h index 3c1008d4eb..aad0c6b3e6 100644 --- a/lib/command.h +++ b/lib/command.h @@ -444,7 +444,7 @@ extern struct cmd_element config_exit_cmd; extern struct cmd_element config_quit_cmd; extern struct cmd_element config_help_cmd; extern struct cmd_element config_list_cmd; -extern char *host_config_file (void); +extern const char *host_config_get (void); extern void host_config_set (const char *); extern void print_version (const char *); |