From 0ef90c13b72b74928bfb3c183c7a5bd7240b51ad Mon Sep 17 00:00:00 2001 From: scott-linder Date: Tue, 25 Feb 2014 15:41:16 -0500 Subject: Removes 'proto' dir 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. */ --- src/move.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/move.h (limited to 'src/move.h') diff --git a/src/move.h b/src/move.h new file mode 100644 index 0000000000..bf3371fa2d --- /dev/null +++ b/src/move.h @@ -0,0 +1,44 @@ +#ifndef NEOVIM_MOVE_H +#define NEOVIM_MOVE_H +/* move.c */ +void update_topline_redraw __ARGS((void)); +void update_topline __ARGS((void)); +void update_curswant __ARGS((void)); +void check_cursor_moved __ARGS((win_T *wp)); +void changed_window_setting __ARGS((void)); +void changed_window_setting_win __ARGS((win_T *wp)); +void set_topline __ARGS((win_T *wp, linenr_T lnum)); +void changed_cline_bef_curs __ARGS((void)); +void changed_cline_bef_curs_win __ARGS((win_T *wp)); +void changed_line_abv_curs __ARGS((void)); +void changed_line_abv_curs_win __ARGS((win_T *wp)); +void validate_botline __ARGS((void)); +void invalidate_botline __ARGS((void)); +void invalidate_botline_win __ARGS((win_T *wp)); +void approximate_botline_win __ARGS((win_T *wp)); +int cursor_valid __ARGS((void)); +void validate_cursor __ARGS((void)); +void validate_cline_row __ARGS((void)); +void validate_virtcol __ARGS((void)); +void validate_virtcol_win __ARGS((win_T *wp)); +void validate_cursor_col __ARGS((void)); +int win_col_off __ARGS((win_T *wp)); +int curwin_col_off __ARGS((void)); +int win_col_off2 __ARGS((win_T *wp)); +int curwin_col_off2 __ARGS((void)); +void curs_columns __ARGS((int may_scroll)); +void scrolldown __ARGS((long line_count, int byfold)); +void scrollup __ARGS((long line_count, int byfold)); +void check_topfill __ARGS((win_T *wp, int down)); +void scrolldown_clamp __ARGS((void)); +void scrollup_clamp __ARGS((void)); +void scroll_cursor_top __ARGS((int min_scroll, int always)); +void set_empty_rows __ARGS((win_T *wp, int used)); +void scroll_cursor_bot __ARGS((int min_scroll, int set_topbot)); +void scroll_cursor_halfway __ARGS((int atend)); +void cursor_correct __ARGS((void)); +int onepage __ARGS((int dir, long count)); +void halfpage __ARGS((int flag, linenr_T Prenum)); +void do_check_cursorbind __ARGS((void)); +/* vim: set ft=c : */ +#endif /* NEOVIM_MOVE_H */ -- cgit