diff options
Diffstat (limited to 'src')
78 files changed, 236 insertions, 70 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index 034ced184a..913491c6ca 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -1,5 +1,6 @@ // Much of this code was adapted from 'if_py_both.h' from the original // vim source +#include <errno.h> #include <stdint.h> #include <stdlib.h> diff --git a/src/nvim/api/private/handle.c b/src/nvim/api/private/handle.c index 035162c5f6..4c0b01ddd7 100644 --- a/src/nvim/api/private/handle.c +++ b/src/nvim/api/private/handle.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <stdint.h> #include "nvim/vim.h" diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index 024f0c2405..839a06c29f 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> @@ -5,6 +6,7 @@ #include "nvim/api/private/helpers.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/handle.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/buffer.h" #include "nvim/window.h" diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 0a5dfdf337..03b9257d79 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1,9 +1,11 @@ +#include <assert.h> #include <stdint.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> #include "nvim/api/vim.h" +#include "nvim/ascii.h" #include "nvim/api/private/helpers.h" #include "nvim/api/private/defs.h" #include "nvim/api/buffer.h" @@ -12,7 +14,6 @@ #include "nvim/buffer.h" #include "nvim/window.h" #include "nvim/types.h" -#include "nvim/ascii.h" #include "nvim/ex_docmd.h" #include "nvim/screen.h" #include "nvim/memory.h" diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c index 4e2993dcb5..47f6f8d399 100644 --- a/src/nvim/arabic.c +++ b/src/nvim/arabic.c @@ -11,6 +11,7 @@ /// Stand-Alone - unicode form-B isolated char denoted with a_s_* (NOT USED) #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/arabic.h" // Arabic ISO-10646-1 character set definition diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 44f3d2ea63..a34d2d03da 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -24,9 +24,13 @@ * The current implementation remembers all file names ever used. */ +#include <stdbool.h> +#include <errno.h> #include <string.h> +#include <inttypes.h> #include "nvim/api/private/handle.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 549c926763..3e1e7c1870 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -2,11 +2,14 @@ /// /// Code related to character sets. +#include <assert.h> #include <string.h> #include <wctype.h> #include <wchar.h> // for towupper() and towlower() +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/charset.h" #include "nvim/farsi.h" #include "nvim/func_attr.h" diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c index 18e95f0741..64a3b73f15 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -1,4 +1,5 @@ #include <stdbool.h> +#include <inttypes.h> #include "nvim/cursor.h" #include "nvim/charset.h" @@ -9,6 +10,7 @@ #include "nvim/move.h" #include "nvim/screen.h" #include "nvim/vim.h" +#include "nvim/ascii.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "cursor.c.generated.h" diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c index a36f04ce8f..9992fbdfcf 100644 --- a/src/nvim/cursor_shape.c +++ b/src/nvim/cursor_shape.c @@ -1,4 +1,5 @@ #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/cursor_shape.h" #include "nvim/misc2.h" #include "nvim/ex_getln.h" diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 1cea6e759e..20b40a7864 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2,7 +2,12 @@ /// /// Code for diff'ing two, three or four buffers. +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/diff.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index ffa2501235..784a97de73 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -2,7 +2,10 @@ /// /// code for digraphs +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/digraph.h" #include "nvim/charset.h" #include "nvim/ex_cmds2.h" diff --git a/src/nvim/edit.c b/src/nvim/edit.c index a70982150c..8cfaddde86 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -10,9 +10,14 @@ * edit.c: functions for Insert mode */ +#include <assert.h> +#include <errno.h> #include <string.h> +#include <inttypes.h> +#include <stdbool.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/edit.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 05553088d9..973088a806 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10,10 +10,19 @@ * eval.c: Expression evaluation. */ +#include <errno.h> +#include <inttypes.h> +#include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <math.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif #include "nvim/eval.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 70ac80faf8..fe0e14adb6 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -10,10 +10,13 @@ * ex_cmds.c: some functions for command line commands */ +#include <errno.h> #include <string.h> #include <stdlib.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/version_defs.h" #include "nvim/ex_cmds.h" #include "nvim/buffer.h" diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 7a34aba6b9..e3024f6fb0 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -10,9 +10,16 @@ * ex_cmds2.c: some more functions for command line commands */ +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif #include "nvim/version_defs.h" #include "nvim/ex_cmds2.h" #include "nvim/buffer.h" diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index aa6e68dd4b..a82623691e 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -11,8 +11,12 @@ */ #include <string.h> +#include <stdbool.h> +#include <errno.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/ex_docmd.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index 5122e61c82..3e1672c2e7 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -9,8 +9,12 @@ /* * ex_eval.c: functions for Ex command line for the +eval feature. */ +#include <stdbool.h> + +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/ex_eval.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 90430b3f6b..3447731134 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -10,10 +10,13 @@ * ex_getln.c: Functions for entering and editing an Ex command line. */ +#include <errno.h> #include <string.h> #include <stdlib.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/arabic.h" #include "nvim/ex_getln.h" #include "nvim/buffer.h" diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c index bc25d0535a..13a284e926 100644 --- a/src/nvim/farsi.c +++ b/src/nvim/farsi.c @@ -18,6 +18,7 @@ #include "nvim/screen.h" #include "nvim/strings.h" #include "nvim/vim.h" +#include "nvim/ascii.h" #define SRC_EDT 0 diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 6694630337..845a99acad 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -44,9 +44,13 @@ * functions. */ +#include <errno.h> #include <string.h> +#include <stdbool.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/file_search.h" #include "nvim/charset.h" #include "nvim/fileio.h" diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index b87b606f98..f4d4005fa8 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -10,9 +10,13 @@ * fileio.c: read from and write to a file */ +#include <errno.h> +#include <stdbool.h> #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/fileio.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 44c67ee8ca..f65bbc0875 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -12,8 +12,10 @@ */ #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/fold.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/garray.c b/src/nvim/garray.c index 2cef08ef5f..033ea9baac 100644 --- a/src/nvim/garray.c +++ b/src/nvim/garray.c @@ -3,6 +3,7 @@ /// Functions for handling growing arrays. #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index b169899cea..e8ce624e25 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -15,9 +15,12 @@ * mappings and abbreviations */ +#include <stdbool.h> #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/getchar.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/globals.h b/src/nvim/globals.h index ceb0953d14..06d39494db 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -8,8 +8,6 @@ #ifndef NVIM_GLOBALS_H #define NVIM_GLOBALS_H -#include <stdbool.h> - #include "nvim/ex_eval.h" #include "nvim/mbyte.h" #include "nvim/menu.h" diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 8db4c264b2..e67cb67c69 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -10,9 +10,15 @@ * hardcopy.c: printing to paper */ +#include <errno.h> #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif #include "nvim/version_defs.h" #include "nvim/hardcopy.h" #include "nvim/buffer.h" diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c index 85cd59f59f..5b0dc508fa 100644 --- a/src/nvim/hashtab.c +++ b/src/nvim/hashtab.c @@ -18,10 +18,13 @@ /// of the entries is empty to keep the lookup efficient (at the cost of extra /// memory). +#include <assert.h> #include <stdbool.h> #include <string.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/hashtab.h" #include "nvim/message.h" #include "nvim/memory.h" diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index 94fbc15ede..9ce0eb7fa0 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -7,8 +7,14 @@ * * See README.txt for an overview of the Vim source code. */ +#include <stdbool.h> + +#include <assert.h> +#include <errno.h> +#include <inttypes.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/if_cscope.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 91fc1588cc..cd53194816 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -1,3 +1,6 @@ +#include <inttypes.h> + +#include "nvim/ascii.h" #include "nvim/indent.h" #include "nvim/eval.h" #include "nvim/charset.h" diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 605cb5457c..6e12194b63 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -1,4 +1,7 @@ +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/misc1.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index 8b4015b97c..4b3b0dd5af 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -3,7 +3,10 @@ * special key codes. */ +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/keymap.h" #include "nvim/charset.h" #include "nvim/edit.h" diff --git a/src/nvim/main.c b/src/nvim/main.c index 8855d14073..344baa6b53 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -7,9 +7,12 @@ */ #define EXTERN +#include <errno.h> +#include <inttypes.h> #include <string.h> #include <stdbool.h> +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/main.h" #include "nvim/buffer.h" @@ -24,6 +27,9 @@ #include "nvim/getchar.h" #include "nvim/hashtab.h" #include "nvim/if_cscope.h" +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif #include "nvim/mark.h" #include "nvim/mbyte.h" #include "nvim/memline.h" diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 43cc3218af..90abbb6fbb 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -10,9 +10,13 @@ * mark.c: functions for setting marks and jumping to them */ +#include <assert.h> +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/mark.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 96ea9b3fe1..65ba461539 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -76,10 +76,17 @@ * some commands, like ":menutrans" */ +#include <errno.h> +#include <inttypes.h> #include <string.h> -# include <wchar.h> +#include <wchar.h> +#include <wctype.h> #include "nvim/vim.h" +#include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif #include "nvim/mbyte.h" #include "nvim/charset.h" #include "nvim/cursor.h" @@ -98,7 +105,7 @@ #include "nvim/os/os.h" #include "nvim/arabic.h" -# define WINBYTE BYTE +#define WINBYTE BYTE typedef struct { int rangeStart; diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index c681d0d43c..6e8d8f9972 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -31,9 +31,12 @@ * file is opened. */ +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/memfile.h" #include "nvim/fileio.h" #include "nvim/memline.h" diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 78ff29c8e3..2627d98292 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -41,8 +41,12 @@ * mf_get(). */ +#include <errno.h> +#include <inttypes.h> #include <string.h> +#include <stdbool.h> +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/memline.h" #include "nvim/buffer.h" diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 85c07a299e..d1649f2945 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -1,6 +1,9 @@ // Various routines dealing with allocation and deallocation of memory. +#include <errno.h> +#include <inttypes.h> #include <string.h> +#include <stdbool.h> #include "nvim/vim.h" #include "nvim/misc2.h" diff --git a/src/nvim/menu.c b/src/nvim/menu.c index ab5c1569dc..9c81824cbb 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -11,9 +11,11 @@ * Code for menus. Used for the GUI and 'wildmenu'. */ +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/menu.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/message.c b/src/nvim/message.c index 37a31ccf25..b026976626 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -12,10 +12,15 @@ #define MESSAGE_FILE /* don't include prototype for smsg() */ +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> +#include <stdarg.h> #include <string.h> #include <math.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/message.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 16ace76e0a..787c062699 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -10,9 +10,12 @@ * misc1.c: functions that didn't seem to fit elsewhere */ +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/version_defs.h" #include "nvim/misc1.h" #include "nvim/charset.h" diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c index 680dff394f..d2da6cbd65 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -9,9 +9,12 @@ /* * misc2.c: Various functions. */ +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/misc2.h" #include "nvim/file_search.h" #include "nvim/buffer.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index 991b09794f..209b6b1a4f 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -16,7 +16,10 @@ * The 'scrolloff' option makes this a bit complicated. */ +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/move.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 25b56c4d84..82e2287dee 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -11,10 +11,13 @@ * the operators. */ +#include <errno.h> +#include <inttypes.h> #include <string.h> #include <stdlib.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/normal.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/ops.c b/src/nvim/ops.c index e80ffac6e1..4432116193 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -11,9 +11,12 @@ * op_change, op_yank, do_put, do_join */ +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/ops.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/option.c b/src/nvim/option.c index dbc8350013..b80f014441 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -31,11 +31,15 @@ */ #define IN_OPTION_C +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include <stdint.h> #include <stdlib.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/option.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c index 9bba247a7b..14293d71e5 100644 --- a/src/nvim/os/channel.c +++ b/src/nvim/os/channel.c @@ -1,4 +1,6 @@ +#include <stdbool.h> #include <string.h> +#include <inttypes.h> #include <uv.h> #include <msgpack.h> diff --git a/src/nvim/os/dl.c b/src/nvim/os/dl.c index 980998eb40..e7a957a3aa 100644 --- a/src/nvim/os/dl.c +++ b/src/nvim/os/dl.c @@ -1,5 +1,6 @@ /// Functions for using external native libraries +#include <stdbool.h> #include <stdint.h> #include <uv.h> diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index b87d561fa6..3e66a019b3 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -2,6 +2,7 @@ #include <uv.h> +#include "nvim/ascii.h" #include "nvim/os/os.h" #include "nvim/misc2.h" #include "nvim/strings.h" diff --git a/src/nvim/os/event.c b/src/nvim/os/event.c index a8bd6ca886..a9e97c9190 100644 --- a/src/nvim/os/event.c +++ b/src/nvim/os/event.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <stdint.h> #include <stdbool.h> #include <stdlib.h> diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 65b88c06f4..5ccefd8ac5 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -1,6 +1,10 @@ // fs.c -- filesystem access +#include <stdbool.h> + +#include <assert.h> #include "nvim/os/os.h" +#include "nvim/ascii.h" #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/misc1.h" diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c index 0f6d2df12f..504aeafbc1 100644 --- a/src/nvim/os/input.c +++ b/src/nvim/os/input.c @@ -8,6 +8,7 @@ #include "nvim/os/event.h" #include "nvim/os/rstream_defs.h" #include "nvim/os/rstream.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/ui.h" #include "nvim/fileio.h" diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c index 81714f7bae..5286599586 100644 --- a/src/nvim/os/rstream.c +++ b/src/nvim/os/rstream.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <stdint.h> #include <stdbool.h> #include <stdlib.h> @@ -9,6 +10,7 @@ #include "nvim/os/rstream.h" #include "nvim/os/event_defs.h" #include "nvim/os/event.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/memory.h" #include "nvim/log.h" diff --git a/src/nvim/os/server.c b/src/nvim/os/server.c index 4bbe81ad01..6e77c6b334 100644 --- a/src/nvim/os/server.c +++ b/src/nvim/os/server.c @@ -8,6 +8,7 @@ #include "nvim/os/channel.h" #include "nvim/os/server.h" #include "nvim/os/os.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/memory.h" #include "nvim/message.h" diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index ed842ba8b2..68cd2ad527 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -4,12 +4,12 @@ #include <uv.h> +#include "nvim/ascii.h" #include "nvim/os/shell.h" #include "nvim/os/signal.h" #include "nvim/types.h" #include "nvim/vim.h" #include "nvim/message.h" -#include "nvim/ascii.h" #include "nvim/memory.h" #include "nvim/term.h" #include "nvim/misc2.h" diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c index cfdc8821a4..c7b4f86d6f 100644 --- a/src/nvim/os/signal.c +++ b/src/nvim/os/signal.c @@ -3,6 +3,7 @@ #include <uv.h> #include "nvim/types.h" +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/globals.h" #include "nvim/memline.h" diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c index b6c013fa59..99479b0bae 100644 --- a/src/nvim/os/users.c +++ b/src/nvim/os/users.c @@ -2,6 +2,7 @@ #include <uv.h> +#include "nvim/ascii.h" #include "nvim/os/os.h" #include "nvim/garray.h" #include "nvim/memory.h" diff --git a/src/nvim/os/uv_helpers.c b/src/nvim/os/uv_helpers.c index a3c9dd5fbf..89687bdac7 100644 --- a/src/nvim/os/uv_helpers.c +++ b/src/nvim/os/uv_helpers.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <uv.h> #include "nvim/os/uv_helpers.h" diff --git a/src/nvim/os/wstream.c b/src/nvim/os/wstream.c index 13b8e8d9dc..3c4b5b6171 100644 --- a/src/nvim/os/wstream.c +++ b/src/nvim/os/wstream.c @@ -1,3 +1,4 @@ +#include <assert.h> #include <stdint.h> #include <stdbool.h> diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index e1b622081c..31653960ef 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -25,10 +25,14 @@ */ # define select select_declared_wrong +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/api/private/handle.h" #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/os_unix.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/path.c b/src/nvim/path.c index 1231d16ed8..ea6390a688 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1,6 +1,12 @@ + +#include <assert.h> +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <stdlib.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/path.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 4ff1132ab9..69dce359d1 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -2,7 +2,10 @@ /// /// Popup menu (PUM) // +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/popupmnu.h" #include "nvim/charset.h" #include "nvim/ex_cmds.h" diff --git a/src/nvim/proto.h b/src/nvim/proto.h deleted file mode 100644 index d628e1f998..0000000000 --- a/src/nvim/proto.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef NVIM_PROTO_H -#define NVIM_PROTO_H - -/* - * VIM - Vi IMproved by Bram Moolenaar - * - * Do ":help uganda" in Vim to read copying and usage conditions. - * Do ":help credits" in Vim to see a list of people who contributed. - */ - -/* - * proto.h: include the (automatically generated) function prototypes - */ - -/* - * Don't include these while generating prototypes. Prevents problems when - * files are missing. - */ -#if !defined(PROTO) && !defined(NOPROTO) - -/* - * Machine-dependent routines. - */ -/* avoid errors in function prototypes */ -# define Display int -# define Widget int -# define GdkEvent int -# define GdkEventKey int -# define XImage int - -/* These prototypes cannot be produced automatically and conflict with - * the old-style prototypes in message.c. */ -int -smsg(char_u *, ...); - -int -smsg_attr(int, char_u *, ...); - -int -vim_snprintf_add(char *, size_t, char *, ...); - -int -vim_snprintf(char *, size_t, char *, ...); - -int vim_vsnprintf(char *str, size_t str_m, char *fmt, va_list ap, typval_T *tvs); - -#endif /* !PROTO && !NOPROTO */ - -#endif // NVIM_PROTO_H diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 3f61414f4b..ec95c74fef 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -10,9 +10,13 @@ * quickfix.c: functions for quickfix mode, using a file with error messages */ +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/quickfix.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 0ead83e0d4..c8bcb5c8dd 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -43,9 +43,12 @@ /* #undef REGEXP_DEBUG */ /* #define REGEXP_DEBUG */ +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/regexp.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 8781e06649..644e7d38a9 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -4,6 +4,10 @@ * This file is included in "regexp.c". */ +#include <inttypes.h> +#include <stdbool.h> + +#include "nvim/ascii.h" #include "nvim/misc2.h" #include "nvim/garray.h" diff --git a/src/nvim/screen.c b/src/nvim/screen.c index ed624643c8..308c95ca02 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -86,9 +86,13 @@ * update_screen() called to redraw. */ +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/arabic.h" #include "nvim/screen.h" #include "nvim/buffer.h" diff --git a/src/nvim/search.c b/src/nvim/search.c index 9b975bfd54..e1c709aed2 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -9,8 +9,11 @@ * search.c: code for normal mode searching commands */ +#include <errno.h> +#include <inttypes.h> #include <string.h> +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/search.h" #include "nvim/charset.h" diff --git a/src/nvim/sha256.c b/src/nvim/sha256.c index 587e0504bf..9877a82fa1 100644 --- a/src/nvim/sha256.c +++ b/src/nvim/sha256.c @@ -12,6 +12,7 @@ /// 2. sha2_seed() generates a random header. /// sha256_self_test() is implicitly called once. +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 9a60bb591d..55e86d1339 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -284,10 +284,14 @@ // stored as an offset to the previous number in as // few bytes as possible, see offset2bytes()) +#include <errno.h> +#include <inttypes.h> #include <string.h> #include <stdlib.h> +#include <wctype.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/spell.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 45aec5841b..d34014ac75 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1,6 +1,11 @@ + +#include <errno.h> +#include <inttypes.h> +#include <stdbool.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/strings.h" #include "nvim/misc2.h" #include "nvim/file_search.h" diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 76edccfefa..0b1754a31d 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -10,10 +10,14 @@ * syntax.c: code for syntax highlighting */ +#include <assert.h> +#include <errno.h> +#include <inttypes.h> #include <string.h> #include <stdlib.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/syntax.h" #include "nvim/charset.h" #include "nvim/eval.h" diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 8d229caf1b..dd3a2316c9 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -10,9 +10,12 @@ * Code to handle tags and the tag stack */ +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/tag.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/term.c b/src/nvim/term.c index 9c655f112a..3e5511166c 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -22,9 +22,12 @@ */ #define tgetstr tgetstr_defined_wrong +#include <errno.h> +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/term.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 7c20f2582d..4a39c56eee 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -15,6 +15,7 @@ * 3. Input buffer stuff. */ +#include <inttypes.h> #include <string.h> #include "nvim/vim.h" diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 5969f2dc7c..de963683fe 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -80,9 +80,12 @@ #define UH_MAGIC 0x18dade /* value for uh_magic when in use */ #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */ +#include <inttypes.h> +#include <errno.h> #include <string.h> #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/undo.h" #include "nvim/cursor.h" #include "nvim/edit.h" diff --git a/src/nvim/version.c b/src/nvim/version.c index 5af9105eed..7a807e7696 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -10,10 +10,14 @@ /// All the remarks about older versions have been removed, they are not very /// interesting. +#include <inttypes.h> + #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/version.h" #include "nvim/charset.h" #include "nvim/memline.h" +#include "nvim/memory.h" #include "nvim/message.h" #include "nvim/misc2.h" #include "nvim/screen.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 4f321dc0b6..edae04812b 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -8,12 +8,8 @@ #ifndef NVIM_VIM_H # define NVIM_VIM_H -#include "nvim/memory.h"// for xstrlcpy #include "nvim/types.h" -/* Included when ported to cmake */ -/* This is needed to replace TRUE/FALSE macros by true/false from c99 */ -#include <stdbool.h> /* Some defines from the old feature.h */ #define SESSION_FILE "Session.vim" #define MAX_MSG_HIST_LEN 200 @@ -48,10 +44,6 @@ Error: configure did not run properly.Check auto/config.log. #include "nvim/os_unix_defs.h" /* bring lots of system header files */ -# ifdef HAVE_LOCALE_H -# include <locale.h> -# endif - /* * Maximum length of a path (for non-unix systems) Make it a bit long, to stay * on the safe side. But not too long to put on the stack. @@ -96,18 +88,12 @@ typedef uint16_t u8char_T; typedef uint32_t u8char_T; # endif -#include "nvim/ascii.h" #include "nvim/keymap.h" #include "nvim/term_defs.h" #include "nvim/macros.h" -#include <errno.h> -#include <assert.h> -#include <inttypes.h> -#include <wctype.h> -#include <stdarg.h> /* ================ end of the header file puzzle =============== */ @@ -1105,7 +1091,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */ #include "nvim/buffer_defs.h" /* buffer and windows */ #include "nvim/ex_cmds_defs.h" /* Ex command defines */ -#include "nvim/proto.h" /* function prototypes */ /* This has to go after the include of proto.h, as proto/gui.pro declares * functions of these names. The declarations would break if the defines had diff --git a/src/nvim/window.c b/src/nvim/window.c index 994d576469..1bdefdae5d 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6,8 +6,13 @@ * See README.txt for an overview of the Vim source code. */ +#include <errno.h> +#include <assert.h> +#include <inttypes.h> + #include "nvim/api/private/handle.h" #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/window.h" #include "nvim/buffer.h" #include "nvim/charset.h" |