mirror of
https://github.com/neovim/neovim.git
synced 2026-01-22 21:23:12 +10:00
0ef90c13b7
See #137 for the issue. Every header in the proto directory was: * Given include guards in the form #ifndef NEOVIM_FILENAME_H #define NEOVIM_FILENAME_H ... #endif /* NEOVIM_FILENAM_H */ * Renamed from *.pro -> *.h * Moved from src/proto/ to src/ This would have caused conficts with some existing headers in src/; rather than merge these conflicts now (which is a whole other can of worms involving multiple and conditional inclusion), any header in src/ with a conflicting name was renamed from *.h -> *_defs.h (which may or may not actually describe its purpose, the change is purely a namespacing issue). Once all of these changes were made a script was developed to determine what #includes needed to be added to each source file to describe its dependencies and allow it to compile; because the script is so short and I'll just list it here: #! /bin/bash cd $(dirname $0) # Scrapes `make` output for provided error messages and outputs #includes # needed to resolve them. # $1 : part of the clang error message between filename and identifier list_missing_includes() { for file_missing_pair in $(CC=clang make 2>&1 >/dev/null | sed -n "s/\/\(.*\.[hc]\).*$1.*'\(.*\)'.*/\1:\2/p"); do fields=(${file_missing_pair//:/ }) source_file=${fields[0]} missing_func=${fields[1]} # Try to find the declaration of the missing function. echo $(basename $source_file) \ \#include \"$(grep -r "\b$missing_func __ARGS" | sed -n "s/.*\/\(.*\)\:.*/\1/p")\" # Remove duplicates done | sort | uniq } echo "Finding missing function prototypes..." list_missing_includes "implicit declaration of function" echo "Finding missing identifier declarations..." list_missing_includes "use of undeclared identifier" Each list of required headers was added by hand in the following format: #include "vim.h" #include "*_defs.h" #include "filename.h" /* All other includes in same module here, in alphabetical order. */ /* All includes from other modules (e.g. "os/*.h") here in alphabetical * order. */
34 lines
1.5 KiB
C
34 lines
1.5 KiB
C
#ifndef NEOVIM_DIFF_H
|
|
#define NEOVIM_DIFF_H
|
|
/* diff.c */
|
|
void diff_buf_delete __ARGS((buf_T *buf));
|
|
void diff_buf_adjust __ARGS((win_T *win));
|
|
void diff_buf_add __ARGS((buf_T *buf));
|
|
void diff_invalidate __ARGS((buf_T *buf));
|
|
void diff_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount,
|
|
long amount_after));
|
|
void ex_diffupdate __ARGS((exarg_T *eap));
|
|
void ex_diffpatch __ARGS((exarg_T *eap));
|
|
void ex_diffsplit __ARGS((exarg_T *eap));
|
|
void ex_diffthis __ARGS((exarg_T *eap));
|
|
void diff_win_options __ARGS((win_T *wp, int addbuf));
|
|
void ex_diffoff __ARGS((exarg_T *eap));
|
|
void diff_clear __ARGS((tabpage_T *tp));
|
|
int diff_check __ARGS((win_T *wp, linenr_T lnum));
|
|
int diff_check_fill __ARGS((win_T *wp, linenr_T lnum));
|
|
void diff_set_topline __ARGS((win_T *fromwin, win_T *towin));
|
|
int diffopt_changed __ARGS((void));
|
|
int diffopt_horizontal __ARGS((void));
|
|
int diff_find_change __ARGS((win_T *wp, linenr_T lnum, int *startp, int *endp));
|
|
int diff_infold __ARGS((win_T *wp, linenr_T lnum));
|
|
void nv_diffgetput __ARGS((int put));
|
|
void ex_diffgetput __ARGS((exarg_T *eap));
|
|
int diff_mode_buf __ARGS((buf_T *buf));
|
|
int diff_move_to __ARGS((int dir, long count));
|
|
linenr_T diff_get_corresponding_line __ARGS((buf_T *buf1, linenr_T lnum1,
|
|
buf_T *buf2,
|
|
linenr_T lnum3));
|
|
linenr_T diff_lnum_win __ARGS((linenr_T lnum, win_T *wp));
|
|
/* vim: set ft=c : */
|
|
#endif /* NEOVIM_DIFF_H */
|