From e3db6365467bf6087e5eced3bce3969ff975a864 Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Tue, 17 Jun 2014 00:13:35 -0500 Subject: remove proto.h include from vim.h --- src/nvim/proto.h | 49 ------------------------------------------------- src/nvim/vim.h | 1 - 2 files changed, 50 deletions(-) delete mode 100644 src/nvim/proto.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/vim.h b/src/nvim/vim.h index 4f321dc0b6..66adab1f2d 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -1105,7 +1105,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 -- cgit From a4f441e5475e6316c4bdd08948a843d2aabc8a37 Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Tue, 17 Jun 2014 00:14:21 -0500 Subject: remove stdbool.h include from vim.h and globals.h --- src/nvim/buffer.c | 1 + src/nvim/diff.c | 2 ++ src/nvim/edit.c | 1 + src/nvim/eval.c | 2 ++ src/nvim/ex_cmds2.c | 1 + src/nvim/ex_docmd.c | 1 + src/nvim/ex_eval.c | 1 + src/nvim/file_search.c | 1 + src/nvim/fileio.c | 1 + src/nvim/getchar.c | 1 + src/nvim/globals.h | 2 -- src/nvim/if_cscope.c | 1 + src/nvim/memline.c | 1 + src/nvim/memory.c | 1 + src/nvim/message.c | 1 + src/nvim/ops.c | 1 + src/nvim/option.c | 1 + src/nvim/os/channel.c | 1 + src/nvim/os/dl.c | 1 + src/nvim/os/fs.c | 1 + src/nvim/os_unix.c | 1 + src/nvim/path.c | 1 + src/nvim/quickfix.c | 1 + src/nvim/regexp.c | 1 + src/nvim/regexp_nfa.c | 2 ++ src/nvim/screen.c | 1 + src/nvim/strings.c | 1 + src/nvim/vim.h | 3 --- 28 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 44f3d2ea63..5a8bc92d87 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -24,6 +24,7 @@ * The current implementation remembers all file names ever used. */ +#include #include #include "nvim/api/private/handle.h" diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 1cea6e759e..f861c8ca1c 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2,6 +2,8 @@ /// /// Code for diff'ing two, three or four buffers. +#include + #include "nvim/vim.h" #include "nvim/diff.h" #include "nvim/buffer.h" diff --git a/src/nvim/edit.c b/src/nvim/edit.c index a70982150c..11b0c2bc8f 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -11,6 +11,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/edit.h" diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 05553088d9..0ce0cfb014 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -12,7 +12,9 @@ #include #include +#include #include + #include "nvim/vim.h" #include "nvim/eval.h" #include "nvim/buffer.h" diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 7a34aba6b9..c1f12071d8 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -11,6 +11,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/version_defs.h" diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index aa6e68dd4b..ba4da812bd 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -11,6 +11,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/ex_docmd.h" diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index 5122e61c82..ed17d2e3d4 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -9,6 +9,7 @@ /* * ex_eval.c: functions for Ex command line for the +eval feature. */ +#include #include "nvim/vim.h" #include "nvim/ex_eval.h" diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 6694630337..8c9a7d6b5f 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -45,6 +45,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/file_search.h" diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index b87b606f98..aa2079ddc1 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -10,6 +10,7 @@ * fileio.c: read from and write to a file */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index b169899cea..41b8f56250 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -15,6 +15,7 @@ * mappings and abbreviations */ +#include #include #include "nvim/vim.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 - #include "nvim/ex_eval.h" #include "nvim/mbyte.h" #include "nvim/menu.h" diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index 94fbc15ede..aef104abf9 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -7,6 +7,7 @@ * * See README.txt for an overview of the Vim source code. */ +#include #include "nvim/vim.h" #include "nvim/if_cscope.h" diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 78ff29c8e3..1878d78454 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -42,6 +42,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/memline.h" diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 85c07a299e..eae30952b5 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -1,6 +1,7 @@ // Various routines dealing with allocation and deallocation of memory. #include +#include #include "nvim/vim.h" #include "nvim/misc2.h" diff --git a/src/nvim/message.c b/src/nvim/message.c index 37a31ccf25..c6fe6ac72b 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -12,6 +12,7 @@ #define MESSAGE_FILE /* don't include prototype for smsg() */ +#include #include #include diff --git a/src/nvim/ops.c b/src/nvim/ops.c index e80ffac6e1..8fcad1ba0a 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -11,6 +11,7 @@ * op_change, op_yank, do_put, do_join */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/option.c b/src/nvim/option.c index dbc8350013..205d6e412f 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -31,6 +31,7 @@ */ #define IN_OPTION_C +#include #include #include #include diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c index 9bba247a7b..9c220da97f 100644 --- a/src/nvim/os/channel.c +++ b/src/nvim/os/channel.c @@ -1,3 +1,4 @@ +#include #include #include 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 #include #include diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 65b88c06f4..677fae801b 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -1,4 +1,5 @@ // fs.c -- filesystem access +#include #include "nvim/os/os.h" #include "nvim/memory.h" diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index e1b622081c..6c4a5cbb3b 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -25,6 +25,7 @@ */ # define select select_declared_wrong +#include #include #include "nvim/api/private/handle.h" diff --git a/src/nvim/path.c b/src/nvim/path.c index 1231d16ed8..f18c217574 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1,3 +1,4 @@ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 3f61414f4b..87329a7e02 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -10,6 +10,7 @@ * quickfix.c: functions for quickfix mode, using a file with error messages */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 0ead83e0d4..1c165051b4 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -43,6 +43,7 @@ /* #undef REGEXP_DEBUG */ /* #define REGEXP_DEBUG */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 8781e06649..dd82b23cbd 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -4,6 +4,8 @@ * This file is included in "regexp.c". */ +#include + #include "nvim/misc2.h" #include "nvim/garray.h" diff --git a/src/nvim/screen.c b/src/nvim/screen.c index ed624643c8..afef26fdf0 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -86,6 +86,7 @@ * update_screen() called to redraw. */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 45aec5841b..b6ba54857d 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1,3 +1,4 @@ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 66adab1f2d..f989a43dfb 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -11,9 +11,6 @@ #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 /* Some defines from the old feature.h */ #define SESSION_FILE "Session.vim" #define MAX_MSG_HIST_LEN 200 -- cgit From 8c9cb5f9ef4539f5105720666f067b485e8c4f2e Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Tue, 17 Jun 2014 00:17:06 -0500 Subject: move memory.h include to version.c --- src/nvim/version.c | 1 + src/nvim/vim.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 5af9105eed..b76deb94d5 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -14,6 +14,7 @@ #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 f989a43dfb..ada9e04134 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -8,7 +8,6 @@ #ifndef NVIM_VIM_H # define NVIM_VIM_H -#include "nvim/memory.h"// for xstrlcpy #include "nvim/types.h" /* Some defines from the old feature.h */ -- cgit From 82b71a30569b1db8e78f38b1bc22fa7b088e16fc Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Tue, 17 Jun 2014 10:22:05 -0500 Subject: move ascii.h include out of vim.h --- src/nvim/api/private/helpers.c | 1 + src/nvim/api/vim.c | 2 +- src/nvim/arabic.c | 1 + src/nvim/buffer.c | 1 + src/nvim/charset.c | 1 + src/nvim/cursor.c | 1 + src/nvim/cursor_shape.c | 1 + src/nvim/diff.c | 1 + src/nvim/digraph.c | 1 + src/nvim/edit.c | 1 + src/nvim/eval.c | 1 + src/nvim/ex_cmds.c | 1 + src/nvim/ex_cmds2.c | 1 + src/nvim/ex_docmd.c | 1 + src/nvim/ex_eval.c | 1 + src/nvim/ex_getln.c | 1 + src/nvim/farsi.c | 1 + src/nvim/file_search.c | 1 + src/nvim/fileio.c | 1 + src/nvim/fold.c | 1 + src/nvim/getchar.c | 1 + src/nvim/hardcopy.c | 1 + src/nvim/hashtab.c | 1 + src/nvim/if_cscope.c | 1 + src/nvim/indent.c | 1 + src/nvim/indent_c.c | 1 + src/nvim/keymap.c | 1 + src/nvim/main.c | 1 + src/nvim/mark.c | 1 + src/nvim/mbyte.c | 1 + src/nvim/memfile.c | 1 + src/nvim/memline.c | 1 + src/nvim/menu.c | 1 + src/nvim/message.c | 1 + src/nvim/misc1.c | 1 + src/nvim/misc2.c | 1 + src/nvim/move.c | 1 + src/nvim/normal.c | 1 + src/nvim/ops.c | 1 + src/nvim/option.c | 1 + src/nvim/os/env.c | 1 + src/nvim/os/fs.c | 1 + src/nvim/os/input.c | 1 + src/nvim/os/rstream.c | 1 + src/nvim/os/server.c | 1 + src/nvim/os/shell.c | 2 +- src/nvim/os/signal.c | 1 + src/nvim/os/users.c | 1 + src/nvim/os_unix.c | 1 + src/nvim/path.c | 1 + src/nvim/popupmnu.c | 1 + src/nvim/quickfix.c | 1 + src/nvim/regexp.c | 1 + src/nvim/regexp_nfa.c | 1 + src/nvim/screen.c | 1 + src/nvim/search.c | 1 + src/nvim/spell.c | 1 + src/nvim/strings.c | 1 + src/nvim/syntax.c | 1 + src/nvim/tag.c | 1 + src/nvim/term.c | 1 + src/nvim/undo.c | 1 + src/nvim/version.c | 1 + src/nvim/vim.h | 1 - src/nvim/window.c | 1 + 65 files changed, 64 insertions(+), 3 deletions(-) diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index 024f0c2405..b10e70f7b4 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -5,6 +5,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..044e59befa 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -4,6 +4,7 @@ #include #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 +13,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 5a8bc92d87..955676672a 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -28,6 +28,7 @@ #include #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..e51eb3796b 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -7,6 +7,7 @@ #include // for towupper() and towlower() #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..10a31c42bf 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -9,6 +9,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 f861c8ca1c..2e751aafaf 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -5,6 +5,7 @@ #include #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..204f64d311 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -3,6 +3,7 @@ /// code for digraphs #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 11b0c2bc8f..ed00b49970 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -14,6 +14,7 @@ #include #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 0ce0cfb014..da14a97e04 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16,6 +16,7 @@ #include #include "nvim/vim.h" +#include "nvim/ascii.h" #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..3eddebdf51 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -14,6 +14,7 @@ #include #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 c1f12071d8..cada3c5818 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -14,6 +14,7 @@ #include #include "nvim/vim.h" +#include "nvim/ascii.h" #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 ba4da812bd..7bdacc5915 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -14,6 +14,7 @@ #include #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 ed17d2e3d4..933b17d917 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -12,6 +12,7 @@ #include #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..b8c8fa2f4a 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -14,6 +14,7 @@ #include #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 8c9a7d6b5f..84ca1c2fed 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -48,6 +48,7 @@ #include #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 aa2079ddc1..13bbfec994 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -14,6 +14,7 @@ #include #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..5993a7e3ee 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -14,6 +14,7 @@ #include #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/getchar.c b/src/nvim/getchar.c index 41b8f56250..5ce603baf4 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -19,6 +19,7 @@ #include #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/hardcopy.c b/src/nvim/hardcopy.c index 8db4c264b2..bc81a4b428 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -13,6 +13,7 @@ #include #include "nvim/vim.h" +#include "nvim/ascii.h" #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..35599cccaf 100644 --- a/src/nvim/hashtab.c +++ b/src/nvim/hashtab.c @@ -22,6 +22,7 @@ #include #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 aef104abf9..a553c2fd3b 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -10,6 +10,7 @@ #include #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..1de98a8c8e 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -1,3 +1,4 @@ +#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..a72b62c8de 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -1,4 +1,5 @@ #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..49d8781d61 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -4,6 +4,7 @@ */ #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..f24c0dab4d 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -10,6 +10,7 @@ #include #include +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/main.h" #include "nvim/buffer.h" diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 43cc3218af..96c7615674 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -13,6 +13,7 @@ #include #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..5b93ecf13f 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -80,6 +80,7 @@ # include #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/mbyte.h" #include "nvim/charset.h" #include "nvim/cursor.h" diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index c681d0d43c..59c8424c9b 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -34,6 +34,7 @@ #include #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 1878d78454..99a440cd9e 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -44,6 +44,7 @@ #include #include +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/memline.h" #include "nvim/buffer.h" diff --git a/src/nvim/menu.c b/src/nvim/menu.c index ab5c1569dc..225e48e633 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -14,6 +14,7 @@ #include #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 c6fe6ac72b..fd62e670b0 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -17,6 +17,7 @@ #include #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..ad24acb108 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -13,6 +13,7 @@ #include #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..632f740a1f 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -12,6 +12,7 @@ #include #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..cb146b6e2a 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -17,6 +17,7 @@ */ #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..ba25ff013e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -15,6 +15,7 @@ #include #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 8fcad1ba0a..1d90220ab6 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -15,6 +15,7 @@ #include #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 205d6e412f..22ed0e39ab 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -37,6 +37,7 @@ #include #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/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 +#include "nvim/ascii.h" #include "nvim/os/os.h" #include "nvim/misc2.h" #include "nvim/strings.h" diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 677fae801b..da89b41902 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -2,6 +2,7 @@ #include #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..04687cbe9a 100644 --- a/src/nvim/os/rstream.c +++ b/src/nvim/os/rstream.c @@ -9,6 +9,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 +#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 #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 +#include "nvim/ascii.h" #include "nvim/os/os.h" #include "nvim/garray.h" #include "nvim/memory.h" diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 6c4a5cbb3b..c8a778a03f 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -30,6 +30,7 @@ #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 f18c217574..17440ec68f 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -2,6 +2,7 @@ #include #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..6bd8a5a77b 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -3,6 +3,7 @@ /// Popup menu (PUM) // #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/quickfix.c b/src/nvim/quickfix.c index 87329a7e02..0062292b4d 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -14,6 +14,7 @@ #include #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 1c165051b4..585cdb901e 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -47,6 +47,7 @@ #include #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 dd82b23cbd..1b88d3e1d4 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -6,6 +6,7 @@ #include +#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 afef26fdf0..565fbae80b 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -90,6 +90,7 @@ #include #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..d4508457d4 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -11,6 +11,7 @@ #include +#include "nvim/ascii.h" #include "nvim/vim.h" #include "nvim/search.h" #include "nvim/charset.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 9a60bb591d..789c509b17 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -288,6 +288,7 @@ #include #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 b6ba54857d..9dcddc8805 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -2,6 +2,7 @@ #include #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..14dc7d2c9c 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -14,6 +14,7 @@ #include #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..6bfd1ded90 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -13,6 +13,7 @@ #include #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..6c173f83ce 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -25,6 +25,7 @@ #include #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/undo.c b/src/nvim/undo.c index 5969f2dc7c..a34ab90513 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -83,6 +83,7 @@ #include #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 b76deb94d5..c9a1c09d5b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -11,6 +11,7 @@ /// interesting. #include "nvim/vim.h" +#include "nvim/ascii.h" #include "nvim/version.h" #include "nvim/charset.h" #include "nvim/memline.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index ada9e04134..3a848f4f26 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -92,7 +92,6 @@ 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" diff --git a/src/nvim/window.c b/src/nvim/window.c index 994d576469..861123696d 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -8,6 +8,7 @@ #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" -- cgit From b18ca14ef8f440ed36fbd68dcb4f31541c290050 Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Tue, 17 Jun 2014 13:43:22 -0500 Subject: move locale.h include out of vim.h --- src/nvim/eval.c | 3 +++ src/nvim/ex_cmds2.c | 3 +++ src/nvim/hardcopy.c | 3 +++ src/nvim/main.c | 3 +++ src/nvim/mbyte.c | 7 +++++-- src/nvim/vim.h | 4 ---- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index da14a97e04..336bdf4e8a 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -17,6 +17,9 @@ #include "nvim/vim.h" #include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include +#endif #include "nvim/eval.h" #include "nvim/buffer.h" #include "nvim/charset.h" diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index cada3c5818..ea027ba225 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -15,6 +15,9 @@ #include "nvim/vim.h" #include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include +#endif #include "nvim/version_defs.h" #include "nvim/ex_cmds2.h" #include "nvim/buffer.h" diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index bc81a4b428..dedddfb30b 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -14,6 +14,9 @@ #include "nvim/vim.h" #include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include +#endif #include "nvim/version_defs.h" #include "nvim/hardcopy.h" #include "nvim/buffer.h" diff --git a/src/nvim/main.c b/src/nvim/main.c index f24c0dab4d..d1c968b511 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -25,6 +25,9 @@ #include "nvim/getchar.h" #include "nvim/hashtab.h" #include "nvim/if_cscope.h" +#ifdef HAVE_LOCALE_H +# include +#endif #include "nvim/mark.h" #include "nvim/mbyte.h" #include "nvim/memline.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 5b93ecf13f..3b36e53f66 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -77,10 +77,13 @@ */ #include -# include +#include #include "nvim/vim.h" #include "nvim/ascii.h" +#ifdef HAVE_LOCALE_H +# include +#endif #include "nvim/mbyte.h" #include "nvim/charset.h" #include "nvim/cursor.h" @@ -99,7 +102,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/vim.h b/src/nvim/vim.h index 3a848f4f26..d927c299cb 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -44,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 -# 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. -- cgit From bf219e1442df06268575853ec6d150e0d09f737a Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Sun, 22 Jun 2014 20:46:34 -0500 Subject: move include out of vim.h --- src/nvim/buffer.c | 1 + src/nvim/charset.c | 1 + src/nvim/cursor.c | 1 + src/nvim/diff.c | 1 + src/nvim/digraph.c | 2 ++ src/nvim/edit.c | 3 ++- src/nvim/eval.c | 1 + src/nvim/ex_cmds.c | 1 + src/nvim/ex_cmds2.c | 3 ++- src/nvim/ex_docmd.c | 1 + src/nvim/ex_eval.c | 2 ++ src/nvim/ex_getln.c | 1 + src/nvim/file_search.c | 1 + src/nvim/fileio.c | 1 + src/nvim/fold.c | 1 + src/nvim/garray.c | 1 + src/nvim/getchar.c | 1 + src/nvim/hardcopy.c | 1 + src/nvim/hashtab.c | 1 + src/nvim/if_cscope.c | 2 ++ src/nvim/indent.c | 2 ++ src/nvim/indent_c.c | 2 ++ src/nvim/keymap.c | 2 ++ src/nvim/main.c | 1 + src/nvim/mark.c | 1 + src/nvim/mbyte.c | 1 + src/nvim/memfile.c | 1 + src/nvim/memline.c | 1 + src/nvim/memory.c | 1 + src/nvim/menu.c | 1 + src/nvim/message.c | 1 + src/nvim/misc1.c | 1 + src/nvim/misc2.c | 1 + src/nvim/move.c | 2 ++ src/nvim/normal.c | 1 + src/nvim/ops.c | 1 + src/nvim/option.c | 1 + src/nvim/os/channel.c | 1 + src/nvim/os_unix.c | 1 + src/nvim/path.c | 2 ++ src/nvim/popupmnu.c | 2 ++ src/nvim/quickfix.c | 1 + src/nvim/regexp.c | 1 + src/nvim/regexp_nfa.c | 1 + src/nvim/screen.c | 1 + src/nvim/search.c | 1 + src/nvim/sha256.c | 1 + src/nvim/spell.c | 1 + src/nvim/strings.c | 2 ++ src/nvim/syntax.c | 1 + src/nvim/tag.c | 1 + src/nvim/term.c | 1 + src/nvim/ui.c | 1 + src/nvim/undo.c | 1 + src/nvim/version.c | 2 ++ src/nvim/vim.h | 1 - src/nvim/window.c | 2 ++ 57 files changed, 70 insertions(+), 3 deletions(-) diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 955676672a..bd4a8497ab 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -26,6 +26,7 @@ #include #include +#include #include "nvim/api/private/handle.h" #include "nvim/ascii.h" diff --git a/src/nvim/charset.c b/src/nvim/charset.c index e51eb3796b..5306acd228 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -5,6 +5,7 @@ #include #include #include // for towupper() and towlower() +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c index 10a31c42bf..64a3b73f15 100644 --- a/src/nvim/cursor.c +++ b/src/nvim/cursor.c @@ -1,4 +1,5 @@ #include +#include #include "nvim/cursor.h" #include "nvim/charset.h" diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 2e751aafaf..cf30ca8ed2 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2,6 +2,7 @@ /// /// Code for diff'ing two, three or four buffers. +#include #include #include "nvim/vim.h" diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index 204f64d311..784a97de73 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -2,6 +2,8 @@ /// /// code for digraphs +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/digraph.h" diff --git a/src/nvim/edit.c b/src/nvim/edit.c index ed00b49970..2a1bd7ed56 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -10,8 +10,9 @@ * edit.c: functions for Insert mode */ -#include +#include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 336bdf4e8a..45fef99fa6 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10,6 +10,7 @@ * eval.c: Expression evaluation. */ +#include #include #include #include diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 3eddebdf51..49a8d743d5 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -12,6 +12,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index ea027ba225..9b24ef2329 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -10,8 +10,9 @@ * ex_cmds2.c: some more functions for command line commands */ -#include +#include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 7bdacc5915..397b6cd22c 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -12,6 +12,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index 933b17d917..3e1672c2e7 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -11,6 +11,8 @@ */ #include +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/ex_eval.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index b8c8fa2f4a..154fe57a55 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -12,6 +12,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 84ca1c2fed..e7e961ea0d 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -46,6 +46,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 13bbfec994..6fb81dc6b5 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -12,6 +12,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 5993a7e3ee..f65bbc0875 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -12,6 +12,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/ascii.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 +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 5ce603baf4..e8ce624e25 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -17,6 +17,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index dedddfb30b..1edbe41295 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -11,6 +11,7 @@ */ #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c index 35599cccaf..4eb1b6275f 100644 --- a/src/nvim/hashtab.c +++ b/src/nvim/hashtab.c @@ -20,6 +20,7 @@ #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index a553c2fd3b..6e93441caf 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -9,6 +9,8 @@ */ #include +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/if_cscope.h" diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 1de98a8c8e..cd53194816 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -1,3 +1,5 @@ +#include + #include "nvim/ascii.h" #include "nvim/indent.h" #include "nvim/eval.h" diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index a72b62c8de..6e12194b63 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -1,3 +1,5 @@ +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/misc1.h" diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index 49d8781d61..4b3b0dd5af 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -3,6 +3,8 @@ * special key codes. */ +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/keymap.h" diff --git a/src/nvim/main.c b/src/nvim/main.c index d1c968b511..a5fa153fa6 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -7,6 +7,7 @@ */ #define EXTERN +#include #include #include diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 96c7615674..a077e60d07 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -10,6 +10,7 @@ * mark.c: functions for setting marks and jumping to them */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 3b36e53f66..70ebbf5b94 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -76,6 +76,7 @@ * some commands, like ":menutrans" */ +#include #include #include diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 59c8424c9b..823faaa68e 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -31,6 +31,7 @@ * file is opened. */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 99a440cd9e..f036348fc2 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -41,6 +41,7 @@ * mf_get(). */ +#include #include #include diff --git a/src/nvim/memory.c b/src/nvim/memory.c index eae30952b5..378c50539c 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -1,5 +1,6 @@ // Various routines dealing with allocation and deallocation of memory. +#include #include #include diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 225e48e633..9c81824cbb 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -11,6 +11,7 @@ * Code for menus. Used for the GUI and 'wildmenu'. */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/message.c b/src/nvim/message.c index fd62e670b0..ce7b4c0942 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -12,6 +12,7 @@ #define MESSAGE_FILE /* don't include prototype for smsg() */ +#include #include #include #include diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index ad24acb108..efef0445df 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -10,6 +10,7 @@ * misc1.c: functions that didn't seem to fit elsewhere */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c index 632f740a1f..d33e10b05a 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -9,6 +9,7 @@ /* * misc2.c: Various functions. */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index cb146b6e2a..209b6b1a4f 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -16,6 +16,8 @@ * The 'scrolloff' option makes this a bit complicated. */ +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/move.h" diff --git a/src/nvim/normal.c b/src/nvim/normal.c index ba25ff013e..d2fd10e6bb 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -11,6 +11,7 @@ * the operators. */ +#include #include #include diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 1d90220ab6..4432116193 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -11,6 +11,7 @@ * op_change, op_yank, do_put, do_join */ +#include #include #include diff --git a/src/nvim/option.c b/src/nvim/option.c index 22ed0e39ab..7f9656224e 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -31,6 +31,7 @@ */ #define IN_OPTION_C +#include #include #include #include diff --git a/src/nvim/os/channel.c b/src/nvim/os/channel.c index 9c220da97f..14293d71e5 100644 --- a/src/nvim/os/channel.c +++ b/src/nvim/os/channel.c @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index c8a778a03f..a2ee25ff8d 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -25,6 +25,7 @@ */ # define select select_declared_wrong +#include #include #include diff --git a/src/nvim/path.c b/src/nvim/path.c index 17440ec68f..ab51facd62 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1,3 +1,5 @@ + +#include #include #include diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c index 6bd8a5a77b..69dce359d1 100644 --- a/src/nvim/popupmnu.c +++ b/src/nvim/popupmnu.c @@ -2,6 +2,8 @@ /// /// Popup menu (PUM) // +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/popupmnu.h" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 0062292b4d..2ef94c430c 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -10,6 +10,7 @@ * quickfix.c: functions for quickfix mode, using a file with error messages */ +#include #include #include diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 585cdb901e..c8bcb5c8dd 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -43,6 +43,7 @@ /* #undef REGEXP_DEBUG */ /* #define REGEXP_DEBUG */ +#include #include #include diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 1b88d3e1d4..644e7d38a9 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -4,6 +4,7 @@ * This file is included in "regexp.c". */ +#include #include #include "nvim/ascii.h" diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 565fbae80b..eef74f9d6a 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -86,6 +86,7 @@ * update_screen() called to redraw. */ +#include #include #include diff --git a/src/nvim/search.c b/src/nvim/search.c index d4508457d4..641ec9e19b 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -9,6 +9,7 @@ * search.c: code for normal mode searching commands */ +#include #include #include "nvim/ascii.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 #include #include "nvim/vim.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 789c509b17..d447849bc8 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -284,6 +284,7 @@ // stored as an offset to the previous number in as // few bytes as possible, see offset2bytes()) +#include #include #include diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 9dcddc8805..25223a63c5 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1,3 +1,5 @@ + +#include #include #include diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 14dc7d2c9c..ac549fe4ae 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -10,6 +10,7 @@ * syntax.c: code for syntax highlighting */ +#include #include #include diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 6bfd1ded90..7525bd2684 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -10,6 +10,7 @@ * Code to handle tags and the tag stack */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/term.c b/src/nvim/term.c index 6c173f83ce..7dfdc8d3b9 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -22,6 +22,7 @@ */ #define tgetstr tgetstr_defined_wrong +#include #include #include "nvim/vim.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 #include #include "nvim/vim.h" diff --git a/src/nvim/undo.c b/src/nvim/undo.c index a34ab90513..ed94b29f78 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -80,6 +80,7 @@ #define UH_MAGIC 0x18dade /* value for uh_magic when in use */ #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */ +#include #include #include "nvim/vim.h" diff --git a/src/nvim/version.c b/src/nvim/version.c index c9a1c09d5b..7a807e7696 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -10,6 +10,8 @@ /// All the remarks about older versions have been removed, they are not very /// interesting. +#include + #include "nvim/vim.h" #include "nvim/ascii.h" #include "nvim/version.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index d927c299cb..46907adca9 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -96,7 +96,6 @@ typedef uint32_t u8char_T; #include -#include #include #include diff --git a/src/nvim/window.c b/src/nvim/window.c index 861123696d..8da12fa382 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6,6 +6,8 @@ * See README.txt for an overview of the Vim source code. */ +#include + #include "nvim/api/private/handle.h" #include "nvim/vim.h" #include "nvim/ascii.h" -- cgit From 8cc8164e5215f98b254f493b670ee5ff1d80938f Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Sun, 22 Jun 2014 20:50:35 -0500 Subject: move wctype.h include out of vim.h --- src/nvim/mbyte.c | 1 + src/nvim/spell.c | 1 + src/nvim/vim.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 70ebbf5b94..cd7a63b5fe 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -79,6 +79,7 @@ #include #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index d447849bc8..a06928762f 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -287,6 +287,7 @@ #include #include #include +#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 46907adca9..a99cf6275b 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -96,7 +96,6 @@ typedef uint32_t u8char_T; #include -#include #include /* ================ end of the header file puzzle =============== */ -- cgit From e69cfa6c15eabfba6f99791482ea657ca325298c Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Mon, 23 Jun 2014 00:40:35 -0500 Subject: move assert.h include out of vim.h --- scripts/msgpack-gen.lua | 1 + src/nvim/api/private/handle.c | 1 + src/nvim/api/private/helpers.c | 1 + src/nvim/api/vim.c | 1 + src/nvim/charset.c | 1 + src/nvim/edit.c | 3 ++- src/nvim/hashtab.c | 1 + src/nvim/if_cscope.c | 1 + src/nvim/mark.c | 1 + src/nvim/os/event.c | 1 + src/nvim/os/fs.c | 2 ++ src/nvim/os/rstream.c | 1 + src/nvim/os/uv_helpers.c | 1 + src/nvim/os/wstream.c | 1 + src/nvim/path.c | 1 + src/nvim/syntax.c | 1 + src/nvim/vim.h | 1 - src/nvim/window.c | 1 + 18 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index d37a85abe8..7f80d48114 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -88,6 +88,7 @@ output = io.open(outputf, 'wb') output:write([[ #include #include +#include #include #include "nvim/os/msgpack_rpc.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 #include #include "nvim/vim.h" diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index b10e70f7b4..839a06c29f 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 044e59befa..03b9257d79 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 5306acd228..3e1e7c1870 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -2,6 +2,7 @@ /// /// Code related to character sets. +#include #include #include #include // for towupper() and towlower() diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 2a1bd7ed56..b9665fd4c6 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -10,9 +10,10 @@ * edit.c: functions for Insert mode */ +#include +#include #include #include -#include #include "nvim/vim.h" #include "nvim/ascii.h" diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c index 4eb1b6275f..5b0dc508fa 100644 --- a/src/nvim/hashtab.c +++ b/src/nvim/hashtab.c @@ -18,6 +18,7 @@ /// of the entries is empty to keep the lookup efficient (at the cost of extra /// memory). +#include #include #include #include diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index 6e93441caf..48b123ed59 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -9,6 +9,7 @@ */ #include +#include #include #include "nvim/vim.h" diff --git a/src/nvim/mark.c b/src/nvim/mark.c index a077e60d07..158f1f9b48 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -10,6 +10,7 @@ * mark.c: functions for setting marks and jumping to them */ +#include #include #include 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 #include #include #include diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index da89b41902..5ccefd8ac5 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -1,6 +1,8 @@ // fs.c -- filesystem access #include +#include + #include "nvim/os/os.h" #include "nvim/ascii.h" #include "nvim/memory.h" diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c index 04687cbe9a..5286599586 100644 --- a/src/nvim/os/rstream.c +++ b/src/nvim/os/rstream.c @@ -1,3 +1,4 @@ +#include #include #include #include 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 #include #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 #include #include diff --git a/src/nvim/path.c b/src/nvim/path.c index ab51facd62..77728a304e 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1,4 +1,5 @@ +#include #include #include #include diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index ac549fe4ae..5beb348af1 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -10,6 +10,7 @@ * syntax.c: code for syntax highlighting */ +#include #include #include #include diff --git a/src/nvim/vim.h b/src/nvim/vim.h index a99cf6275b..0959f87288 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -94,7 +94,6 @@ typedef uint32_t u8char_T; #include -#include #include diff --git a/src/nvim/window.c b/src/nvim/window.c index 8da12fa382..df4a3f2614 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6,6 +6,7 @@ * See README.txt for an overview of the Vim source code. */ +#include #include #include "nvim/api/private/handle.h" -- cgit From b94d07b046887dbe977fab2526aef746ec476f4e Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Mon, 23 Jun 2014 00:47:39 -0500 Subject: move stdarg.h include out of vim.h --- src/nvim/eval.c | 1 + src/nvim/message.c | 1 + src/nvim/vim.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 45fef99fa6..fb8f862c01 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/src/nvim/message.c b/src/nvim/message.c index ce7b4c0942..22286ee742 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 0959f87288..056f2da0ab 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -95,7 +95,6 @@ typedef uint32_t u8char_T; #include -#include /* ================ end of the header file puzzle =============== */ -- cgit From 0fff487690803be45b185ca165e12b470fa0466e Mon Sep 17 00:00:00 2001 From: Brandon Coleman Date: Mon, 23 Jun 2014 01:02:56 -0500 Subject: move errno.h include out of vim.h --- src/nvim/api/buffer.c | 1 + src/nvim/buffer.c | 1 + src/nvim/diff.c | 1 + src/nvim/edit.c | 1 + src/nvim/eval.c | 1 + src/nvim/ex_cmds.c | 1 + src/nvim/ex_cmds2.c | 1 + src/nvim/ex_docmd.c | 1 + src/nvim/ex_getln.c | 1 + src/nvim/file_search.c | 1 + src/nvim/fileio.c | 1 + src/nvim/hardcopy.c | 1 + src/nvim/if_cscope.c | 1 + src/nvim/main.c | 1 + src/nvim/mark.c | 1 + src/nvim/mbyte.c | 1 + src/nvim/memfile.c | 1 + src/nvim/memline.c | 1 + src/nvim/memory.c | 1 + src/nvim/message.c | 1 + src/nvim/misc1.c | 1 + src/nvim/misc2.c | 1 + src/nvim/normal.c | 1 + src/nvim/option.c | 1 + src/nvim/os_unix.c | 1 + src/nvim/path.c | 1 + src/nvim/quickfix.c | 1 + src/nvim/screen.c | 1 + src/nvim/search.c | 1 + src/nvim/spell.c | 1 + src/nvim/strings.c | 1 + src/nvim/syntax.c | 1 + src/nvim/tag.c | 1 + src/nvim/term.c | 1 + src/nvim/undo.c | 1 + src/nvim/vim.h | 1 - src/nvim/window.c | 1 + 37 files changed, 36 insertions(+), 1 deletion(-) 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 #include #include diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index bd4a8497ab..a34d2d03da 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -25,6 +25,7 @@ */ #include +#include #include #include diff --git a/src/nvim/diff.c b/src/nvim/diff.c index cf30ca8ed2..20b40a7864 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2,6 +2,7 @@ /// /// Code for diff'ing two, three or four buffers. +#include #include #include diff --git a/src/nvim/edit.c b/src/nvim/edit.c index b9665fd4c6..8cfaddde86 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/src/nvim/eval.c b/src/nvim/eval.c index fb8f862c01..973088a806 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10,6 +10,7 @@ * eval.c: Expression evaluation. */ +#include #include #include #include diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 49a8d743d5..fe0e14adb6 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -10,6 +10,7 @@ * ex_cmds.c: some functions for command line commands */ +#include #include #include #include diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 9b24ef2329..e3024f6fb0 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -10,6 +10,7 @@ * ex_cmds2.c: some more functions for command line commands */ +#include #include #include #include diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 397b6cd22c..a82623691e 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -12,6 +12,7 @@ #include #include +#include #include #include "nvim/vim.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 154fe57a55..3447731134 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -10,6 +10,7 @@ * ex_getln.c: Functions for entering and editing an Ex command line. */ +#include #include #include #include diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index e7e961ea0d..845a99acad 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -44,6 +44,7 @@ * functions. */ +#include #include #include #include diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 6fb81dc6b5..f4d4005fa8 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -10,6 +10,7 @@ * fileio.c: read from and write to a file */ +#include #include #include #include diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 1edbe41295..e67cb67c69 100644 --- a/src/nvim/hardcopy.c +++ b/src/nvim/hardcopy.c @@ -10,6 +10,7 @@ * hardcopy.c: printing to paper */ +#include #include #include diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index 48b123ed59..9ce0eb7fa0 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -10,6 +10,7 @@ #include #include +#include #include #include "nvim/vim.h" diff --git a/src/nvim/main.c b/src/nvim/main.c index a5fa153fa6..344baa6b53 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -7,6 +7,7 @@ */ #define EXTERN +#include #include #include #include diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 158f1f9b48..90abbb6fbb 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -11,6 +11,7 @@ */ #include +#include #include #include diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index cd7a63b5fe..65ba461539 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -76,6 +76,7 @@ * some commands, like ":menutrans" */ +#include #include #include #include diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 823faaa68e..6e8d8f9972 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -31,6 +31,7 @@ * file is opened. */ +#include #include #include diff --git a/src/nvim/memline.c b/src/nvim/memline.c index f036348fc2..2627d98292 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -41,6 +41,7 @@ * mf_get(). */ +#include #include #include #include diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 378c50539c..d1649f2945 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -1,5 +1,6 @@ // Various routines dealing with allocation and deallocation of memory. +#include #include #include #include diff --git a/src/nvim/message.c b/src/nvim/message.c index 22286ee742..b026976626 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -12,6 +12,7 @@ #define MESSAGE_FILE /* don't include prototype for smsg() */ +#include #include #include #include diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index efef0445df..787c062699 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -10,6 +10,7 @@ * misc1.c: functions that didn't seem to fit elsewhere */ +#include #include #include diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c index d33e10b05a..d2da6cbd65 100644 --- a/src/nvim/misc2.c +++ b/src/nvim/misc2.c @@ -9,6 +9,7 @@ /* * misc2.c: Various functions. */ +#include #include #include diff --git a/src/nvim/normal.c b/src/nvim/normal.c index d2fd10e6bb..82e2287dee 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -11,6 +11,7 @@ * the operators. */ +#include #include #include #include diff --git a/src/nvim/option.c b/src/nvim/option.c index 7f9656224e..b80f014441 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -31,6 +31,7 @@ */ #define IN_OPTION_C +#include #include #include #include diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index a2ee25ff8d..31653960ef 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -25,6 +25,7 @@ */ # define select select_declared_wrong +#include #include #include #include diff --git a/src/nvim/path.c b/src/nvim/path.c index 77728a304e..ea6390a688 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1,5 +1,6 @@ #include +#include #include #include #include diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 2ef94c430c..ec95c74fef 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -10,6 +10,7 @@ * quickfix.c: functions for quickfix mode, using a file with error messages */ +#include #include #include #include diff --git a/src/nvim/screen.c b/src/nvim/screen.c index eef74f9d6a..308c95ca02 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -86,6 +86,7 @@ * update_screen() called to redraw. */ +#include #include #include #include diff --git a/src/nvim/search.c b/src/nvim/search.c index 641ec9e19b..e1c709aed2 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -9,6 +9,7 @@ * search.c: code for normal mode searching commands */ +#include #include #include diff --git a/src/nvim/spell.c b/src/nvim/spell.c index a06928762f..55e86d1339 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -284,6 +284,7 @@ // stored as an offset to the previous number in as // few bytes as possible, see offset2bytes()) +#include #include #include #include diff --git a/src/nvim/strings.c b/src/nvim/strings.c index 25223a63c5..d34014ac75 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -1,4 +1,5 @@ +#include #include #include #include diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 5beb348af1..0b1754a31d 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 7525bd2684..dd3a2316c9 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -10,6 +10,7 @@ * Code to handle tags and the tag stack */ +#include #include #include diff --git a/src/nvim/term.c b/src/nvim/term.c index 7dfdc8d3b9..3e5511166c 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -22,6 +22,7 @@ */ #define tgetstr tgetstr_defined_wrong +#include #include #include diff --git a/src/nvim/undo.c b/src/nvim/undo.c index ed94b29f78..de963683fe 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -81,6 +81,7 @@ #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */ #include +#include #include #include "nvim/vim.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 056f2da0ab..edae04812b 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -92,7 +92,6 @@ typedef uint32_t u8char_T; #include "nvim/term_defs.h" #include "nvim/macros.h" -#include diff --git a/src/nvim/window.c b/src/nvim/window.c index df4a3f2614..1bdefdae5d 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6,6 +6,7 @@ * See README.txt for an overview of the Vim source code. */ +#include #include #include -- cgit