Merge pull request #710 'Automatically generate declarations'

1 files changed, 4 insertions, 44 deletions

diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 7549e77223..0b3e06070c 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -33,45 +33,9 @@
 #endif
 #include "nvim/if_cscope_defs.h"
 
-static void cs_usage_msg(csid_e x);
-static int cs_add(exarg_T *eap);
-static void cs_stat_emsg(char *fname);
-static int cs_add_common(char *, char *, char *);
-static int cs_check_for_connections(void);
-static int cs_check_for_tags(void);
-static int cs_cnt_connections(void);
-static void cs_reading_emsg(int idx);
-static int cs_cnt_matches(int idx);
-static char *       cs_create_cmd(char *csoption, char *pattern);
-static int cs_create_connection(int i);
-static void do_cscope_general(exarg_T *eap, int make_split);
-static void cs_file_results(FILE *, int *);
-static void cs_fill_results(char *, int, int *, char ***,
-                                    char ***, int *);
-static int cs_find(exarg_T *eap);
-static int cs_find_common(char *opt, char *pat, int, int, int,
-                                  char_u *cmdline);
-static int cs_help(exarg_T *eap);
-static void clear_csinfo(int i);
-static int cs_insert_filelist(char *, char *, char *, FileInfo *file_info);
-static int cs_kill(exarg_T *eap);
-static void cs_kill_execute(int, char *);
-static cscmd_T *    cs_lookup_cmd(exarg_T *eap);
-static char *       cs_make_vim_style_matches(char *, char *,
-                                              char *, char *);
-static char *       cs_manage_matches(char **, char **, int, mcmd_e);
-static char *       cs_parse_results(int cnumber, char *buf,
-                                     int bufsize, char **context,
-                                     char **linenumber,
-                                     char **search);
-static char *       cs_pathcomponents(char *path);
-static void cs_print_tags_priv(char **, char **, int);
-static int cs_read_prompt(int);
-static void cs_release_csp(int, int freefnpp);
-static int cs_reset(exarg_T *eap);
-static char *       cs_resolve_file(int, char *);
-static int cs_show(exarg_T *eap);
-
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "if_cscope.c.generated.h"
+#endif
 
 static csinfo_T *   csinfo = NULL;
 static int csinfo_size = 0;             /* number of items allocated in
@@ -1189,8 +1153,6 @@ static void clear_csinfo(int i)
 }
 
 #ifndef UNIX
-static char *GetWin32Error(void);
-
 static char *GetWin32Error(void)
 {
   char *msg = NULL;
@@ -1204,7 +1166,6 @@ static char *GetWin32Error(void)
   }
   return msg;
 }
-
 #endif
 
 /*
@@ -1275,8 +1236,7 @@ static int cs_insert_filelist(char *fname, char *ppath, char *flags,
  *
  * find cscope command in command table
  */
-static cscmd_T * cs_lookup_cmd(eap)
-exarg_T *eap;
+static cscmd_T * cs_lookup_cmd(exarg_T *eap)
 {
   cscmd_T *cmdp;
   char *stok;