--- quagga-0.99.22.4.orig/vtysh/vtysh.c
+++ quagga-0.99.22.4/vtysh/vtysh.c
@@ -2211,9 +2211,9 @@
 vtysh_readline_init (void)
 {
   /* readline related settings. */
-  rl_bind_key ('?', (Function *) vtysh_rl_describe);
+  rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
   rl_completion_entry_function = vtysh_completion_entry_function;
-  rl_attempted_completion_function = (CPPFunction *)new_completion;
+  rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
 }
 
 char *