From 6c14ae6bfaf51415b555e9a6b85d1d280976358d Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 20:27:32 +0100 Subject: [PATCH] refactor: rename types.h to types_defs.h --- src/nvim/api/buffer.c | 2 +- src/nvim/api/command.c | 2 +- src/nvim/api/extmark.h | 2 +- src/nvim/api/private/converter.c | 2 +- src/nvim/api/private/defs.h | 2 +- src/nvim/api/private/dispatch.h | 2 +- src/nvim/api/private/helpers.c | 2 +- src/nvim/api/ui.c | 2 +- src/nvim/api/vim.c | 2 +- src/nvim/api/window.c | 2 +- src/nvim/arglist.c | 2 +- src/nvim/arglist.h | 2 +- src/nvim/autocmd.c | 2 +- src/nvim/autocmd.h | 2 +- src/nvim/autocmd_defs.h | 2 +- src/nvim/buffer.c | 2 +- src/nvim/buffer_updates.c | 2 +- src/nvim/bufwrite.c | 2 +- src/nvim/channel.h | 2 +- src/nvim/cmdexpand.c | 2 +- src/nvim/cmdexpand.h | 2 +- src/nvim/cmdexpand_defs.h | 2 +- src/nvim/cmdhist.c | 2 +- src/nvim/cmdhist.h | 2 +- src/nvim/decoration.h | 2 +- src/nvim/decoration_provider.h | 2 +- src/nvim/diff.c | 2 +- src/nvim/digraph.c | 2 +- src/nvim/digraph.h | 2 +- src/nvim/drawline.c | 2 +- src/nvim/drawline.h | 2 +- src/nvim/drawscreen.c | 2 +- src/nvim/edit.c | 2 +- src/nvim/eval.c | 2 +- src/nvim/eval/buffer.c | 2 +- src/nvim/eval/buffer.h | 2 +- src/nvim/eval/decode.c | 2 +- src/nvim/eval/decode.h | 2 +- src/nvim/eval/encode.c | 2 +- src/nvim/eval/executor.c | 2 +- src/nvim/eval/funcs.h | 2 +- src/nvim/eval/typval.c | 2 +- src/nvim/eval/typval.h | 2 +- src/nvim/eval/typval_defs.h | 2 +- src/nvim/eval/userfunc.c | 2 +- src/nvim/eval/userfunc.h | 2 +- src/nvim/eval/vars.c | 2 +- src/nvim/eval/vars.h | 2 +- src/nvim/eval/window.c | 2 +- src/nvim/ex_cmds.c | 2 +- src/nvim/ex_docmd.c | 2 +- src/nvim/ex_getln.c | 2 +- src/nvim/ex_getln.h | 2 +- src/nvim/extmark.h | 2 +- src/nvim/extmark_defs.h | 2 +- src/nvim/file_search.h | 2 +- src/nvim/fileio.c | 2 +- src/nvim/fold.c | 2 +- src/nvim/fold.h | 2 +- src/nvim/garray.h | 2 +- src/nvim/getchar.c | 2 +- src/nvim/getchar.h | 2 +- src/nvim/globals.h | 2 +- src/nvim/grid.c | 2 +- src/nvim/grid_defs.h | 2 +- src/nvim/hashtab.h | 2 +- src/nvim/help.c | 2 +- src/nvim/highlight.c | 2 +- src/nvim/highlight_defs.h | 2 +- src/nvim/highlight_group.c | 2 +- src/nvim/highlight_group.h | 2 +- src/nvim/indent.c | 2 +- src/nvim/indent.h | 2 +- src/nvim/insexpand.c | 2 +- src/nvim/insexpand.h | 2 +- src/nvim/lua/converter.c | 2 +- src/nvim/lua/executor.h | 2 +- src/nvim/lua/stdlib.c | 2 +- src/nvim/lua/treesitter.c | 2 +- src/nvim/main.c | 2 +- src/nvim/map.h | 2 +- src/nvim/mapping.c | 2 +- src/nvim/mapping.h | 2 +- src/nvim/mapping_defs.h | 2 +- src/nvim/marktree.h | 2 +- src/nvim/match.c | 2 +- src/nvim/match.h | 2 +- src/nvim/mbyte.c | 2 +- src/nvim/mbyte.h | 2 +- src/nvim/memfile_defs.h | 2 +- src/nvim/memline.h | 2 +- src/nvim/menu.c | 2 +- src/nvim/menu.h | 2 +- src/nvim/message.h | 2 +- src/nvim/mouse.c | 2 +- src/nvim/move.c | 2 +- src/nvim/move.h | 2 +- src/nvim/msgpack_rpc/channel.c | 2 +- src/nvim/msgpack_rpc/helpers.c | 2 +- src/nvim/msgpack_rpc/unpacker.h | 2 +- src/nvim/ops.c | 2 +- src/nvim/ops.h | 2 +- src/nvim/option.c | 2 +- src/nvim/option.h | 2 +- src/nvim/option_defs.h | 2 +- src/nvim/option_vars.h | 2 +- src/nvim/optionstr.c | 2 +- src/nvim/os/fileio.c | 2 +- src/nvim/os/fs.c | 2 +- src/nvim/os/fs.h | 2 +- src/nvim/os/lang.h | 2 +- src/nvim/os/shell.c | 2 +- src/nvim/path.h | 2 +- src/nvim/plines.c | 2 +- src/nvim/profile.c | 2 +- src/nvim/quickfix.c | 2 +- src/nvim/quickfix.h | 2 +- src/nvim/regexp.c | 2 +- src/nvim/regexp.h | 2 +- src/nvim/regexp_defs.h | 2 +- src/nvim/runtime.c | 2 +- src/nvim/search.h | 2 +- src/nvim/sign.c | 2 +- src/nvim/sign.h | 2 +- src/nvim/spell.c | 2 +- src/nvim/spellsuggest.c | 2 +- src/nvim/state.c | 2 +- src/nvim/strings.c | 2 +- src/nvim/strings.h | 2 +- src/nvim/syntax.c | 2 +- src/nvim/terminal.c | 2 +- src/nvim/testing.c | 2 +- src/nvim/testing.h | 2 +- src/nvim/tui/input.h | 2 +- src/nvim/tui/tui.c | 2 +- src/nvim/{types.h => types_defs.h} | 0 src/nvim/ui.h | 2 +- src/nvim/ui_client.h | 2 +- src/nvim/ui_compositor.c | 2 +- src/nvim/undo.c | 2 +- src/nvim/undo.h | 2 +- src/nvim/usercmd.h | 2 +- src/nvim/vim.h | 2 +- src/nvim/viml/parser/expressions.c | 2 +- src/nvim/viml/parser/expressions.h | 2 +- src/nvim/window.c | 2 +- src/nvim/window.h | 2 +- 147 files changed, 146 insertions(+), 146 deletions(-) rename src/nvim/{types.h => types_defs.h} (100%) diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index ec667a8953..3f4ab2760d 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -34,7 +34,7 @@ #include "nvim/move.h" #include "nvim/ops.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c index 2d3bc26e62..f9e2c58dd9 100644 --- a/src/nvim/api/command.c +++ b/src/nvim/api/command.c @@ -29,7 +29,7 @@ #include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/usercmd.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/api/extmark.h b/src/nvim/api/extmark.h index 0a28be98c5..2989dee53d 100644 --- a/src/nvim/api/extmark.h +++ b/src/nvim/api/extmark.h @@ -7,7 +7,7 @@ #include "nvim/decoration_defs.h" // IWYU pragma: keep #include "nvim/macros.h" #include "nvim/map.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" EXTERN Map(String, int) namespace_ids INIT( = MAP_INIT); EXTERN handle_T next_namespace_id INIT( = 1); diff --git a/src/nvim/api/private/converter.c b/src/nvim/api/private/converter.c index 228172fd28..40ec680184 100644 --- a/src/nvim/api/private/converter.c +++ b/src/nvim/api/private/converter.c @@ -14,7 +14,7 @@ #include "nvim/func_attr.h" #include "nvim/lua/executor.h" #include "nvim/memory.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" /// Helper structure for vim_to_object diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h index 067592ed4e..25c8377518 100644 --- a/src/nvim/api/private/defs.h +++ b/src/nvim/api/private/defs.h @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/func_attr.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define ARRAY_DICT_INIT KV_INITIAL_VALUE #define STRING_INIT { .data = NULL, .size = 0 } diff --git a/src/nvim/api/private/dispatch.h b/src/nvim/api/private/dispatch.h index 0a651ebd1c..3d12b941f4 100644 --- a/src/nvim/api/private/dispatch.h +++ b/src/nvim/api/private/dispatch.h @@ -5,7 +5,7 @@ #include "nvim/api/private/defs.h" #include "nvim/memory.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef Object (*ApiDispatchWrapper)(uint64_t channel_id, Array args, Arena *arena, Error *error); diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c index 33defa63ef..2599850452 100644 --- a/src/nvim/api/private/helpers.c +++ b/src/nvim/api/private/helpers.c @@ -32,7 +32,7 @@ #include "nvim/message.h" #include "nvim/msgpack_rpc/helpers.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/version.h" diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c index 7366e24703..9eb1cc675f 100644 --- a/src/nvim/api/ui.c +++ b/src/nvim/api/ui.c @@ -29,7 +29,7 @@ #include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/helpers.h" #include "nvim/option.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 73001cfb6a..858fda68b9 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -65,7 +65,7 @@ #include "nvim/statusline.h" #include "nvim/strings.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 15460ec368..de5b40940f 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -24,7 +24,7 @@ #include "nvim/move.h" #include "nvim/plines.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/window.h" /// Gets the current buffer in a window diff --git a/src/nvim/arglist.c b/src/nvim/arglist.c index 37c860565c..7854b9a9a2 100644 --- a/src/nvim/arglist.c +++ b/src/nvim/arglist.c @@ -35,7 +35,7 @@ #include "nvim/path.h" #include "nvim/pos_defs.h" #include "nvim/regexp.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/version.h" #include "nvim/vim.h" diff --git a/src/nvim/arglist.h b/src/nvim/arglist.h index 6ca73291d8..bcb5c8f565 100644 --- a/src/nvim/arglist.h +++ b/src/nvim/arglist.h @@ -4,7 +4,7 @@ #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "arglist.h.generated.h" diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c index ac88b19fb9..b6c853bd66 100644 --- a/src/nvim/autocmd.c +++ b/src/nvim/autocmd.c @@ -49,7 +49,7 @@ #include "nvim/search.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/vim.h" diff --git a/src/nvim/autocmd.h b/src/nvim/autocmd.h index 566c5f5149..a0a060c5b0 100644 --- a/src/nvim/autocmd.h +++ b/src/nvim/autocmd.h @@ -12,7 +12,7 @@ #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/macros.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Set by the apply_autocmds_group function if the given event is equal to // EVENT_FILETYPE. Used by the readfile function in order to determine if diff --git a/src/nvim/autocmd_defs.h b/src/nvim/autocmd_defs.h index 2979c49b67..4639ec2731 100644 --- a/src/nvim/autocmd_defs.h +++ b/src/nvim/autocmd_defs.h @@ -10,7 +10,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" #include "nvim/regexp_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // event_T definition #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 12013c3c5b..86cf805345 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -95,7 +95,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/usercmd.h" diff --git a/src/nvim/buffer_updates.c b/src/nvim/buffer_updates.c index 8840e67847..26e321f956 100644 --- a/src/nvim/buffer_updates.c +++ b/src/nvim/buffer_updates.c @@ -20,7 +20,7 @@ #include "nvim/memory.h" #include "nvim/msgpack_rpc/channel.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "buffer_updates.c.generated.h" // IWYU pragma: export diff --git a/src/nvim/bufwrite.c b/src/nvim/bufwrite.c index fe2341f900..8fd39582d6 100644 --- a/src/nvim/bufwrite.c +++ b/src/nvim/bufwrite.c @@ -43,7 +43,7 @@ #include "nvim/pos_defs.h" #include "nvim/sha256.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/channel.h b/src/nvim/channel.h index 69485da030..53666b0501 100644 --- a/src/nvim/channel.h +++ b/src/nvim/channel.h @@ -17,7 +17,7 @@ #include "nvim/msgpack_rpc/channel_defs.h" #include "nvim/os/pty_process.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define CHAN_STDIO 1 #define CHAN_STDERR 2 diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c index 71f0afe604..57d79dc420 100644 --- a/src/nvim/cmdexpand.c +++ b/src/nvim/cmdexpand.c @@ -62,7 +62,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/tag.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/usercmd.h" #include "nvim/vim.h" diff --git a/src/nvim/cmdexpand.h b/src/nvim/cmdexpand.h index 21578aaa34..4ae702f18d 100644 --- a/src/nvim/cmdexpand.h +++ b/src/nvim/cmdexpand.h @@ -4,7 +4,7 @@ #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_getln.h" #include "nvim/garray_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" // Values for nextwild() and ExpandOne(). See ExpandOne() for meaning. diff --git a/src/nvim/cmdexpand_defs.h b/src/nvim/cmdexpand_defs.h index 7dda7bb031..97307c4e50 100644 --- a/src/nvim/cmdexpand_defs.h +++ b/src/nvim/cmdexpand_defs.h @@ -4,7 +4,7 @@ #include #include "nvim/eval/typval_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef enum { XP_PREFIX_NONE, ///< prefix not used diff --git a/src/nvim/cmdhist.c b/src/nvim/cmdhist.c index cfd43119e1..742a98b58c 100644 --- a/src/nvim/cmdhist.c +++ b/src/nvim/cmdhist.c @@ -24,7 +24,7 @@ #include "nvim/option_vars.h" #include "nvim/regexp.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/cmdhist.h b/src/nvim/cmdhist.h index ed616ba801..cce0f92898 100644 --- a/src/nvim/cmdhist.h +++ b/src/nvim/cmdhist.h @@ -4,7 +4,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" // IWYU pragma: export #include "nvim/os/time.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Present history tables typedef enum { diff --git a/src/nvim/decoration.h b/src/nvim/decoration.h index ac05962049..d315116ef3 100644 --- a/src/nvim/decoration.h +++ b/src/nvim/decoration.h @@ -11,7 +11,7 @@ #include "nvim/macros.h" #include "nvim/marktree.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // actual Decor* data is in decoration_defs.h diff --git a/src/nvim/decoration_provider.h b/src/nvim/decoration_provider.h index 284de9b20d..09ef4773c1 100644 --- a/src/nvim/decoration_provider.h +++ b/src/nvim/decoration_provider.h @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/buffer_defs.h" #include "nvim/macros.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define DP_MAX_ERROR 3 diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 339e1d4c30..cf4c98e5f9 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -53,7 +53,7 @@ #include "nvim/path.h" #include "nvim/pos_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index 65e410cca0..a45417ca1e 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -33,7 +33,7 @@ #include "nvim/os/input.h" #include "nvim/runtime.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" typedef int result_T; diff --git a/src/nvim/digraph.h b/src/nvim/digraph.h index 0a83ccbd3e..792e859991 100644 --- a/src/nvim/digraph.h +++ b/src/nvim/digraph.h @@ -4,7 +4,7 @@ #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/garray_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "digraph.h.generated.h" diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index e388c24630..8b3f6fff2f 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -44,7 +44,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index edec7fea44..20072e4103 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -8,7 +8,7 @@ #include "nvim/fold.h" #include "nvim/macros.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Maximum columns for terminal highlight attributes #define TERM_ATTRS_MAX 1024 diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index 364293ed11..addf3b0b91 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -106,7 +106,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/version.h" diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 20a6770705..16b9a64dfb 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -59,7 +59,7 @@ #include "nvim/terminal.h" #include "nvim/textformat.h" #include "nvim/textobject.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d02d9e0b49..02e0be9a94 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -76,7 +76,7 @@ #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/tag.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/usercmd.h" diff --git a/src/nvim/eval/buffer.c b/src/nvim/eval/buffer.c index 2665fa0503..ce67429d90 100644 --- a/src/nvim/eval/buffer.c +++ b/src/nvim/eval/buffer.c @@ -23,7 +23,7 @@ #include "nvim/path.h" #include "nvim/pos_defs.h" #include "nvim/sign.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/eval/buffer.h b/src/nvim/eval/buffer.h index b0fc0f9208..106a499bad 100644 --- a/src/nvim/eval/buffer.h +++ b/src/nvim/eval/buffer.h @@ -2,7 +2,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "eval/buffer.h.generated.h" diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c index 0f896ba531..dde990d693 100644 --- a/src/nvim/eval/decode.c +++ b/src/nvim/eval/decode.c @@ -21,7 +21,7 @@ #include "nvim/mbyte.h" #include "nvim/memory.h" #include "nvim/message.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" /// Helper structure for container_struct diff --git a/src/nvim/eval/decode.h b/src/nvim/eval/decode.h index b80786bc32..1c0fd445f1 100644 --- a/src/nvim/eval/decode.h +++ b/src/nvim/eval/decode.h @@ -4,7 +4,7 @@ #include // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "eval/decode.h.generated.h" diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 709733564e..f8bf53cf0c 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -28,7 +28,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" // For _() const char *const encode_bool_var_names[] = { diff --git a/src/nvim/eval/executor.c b/src/nvim/eval/executor.c index 79069bbafd..70ab5e1aae 100644 --- a/src/nvim/eval/executor.c +++ b/src/nvim/eval/executor.c @@ -11,7 +11,7 @@ #include "nvim/globals.h" #include "nvim/message.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/eval/funcs.h b/src/nvim/eval/funcs.h index 858da53e13..09f709be06 100644 --- a/src/nvim/eval/funcs.h +++ b/src/nvim/eval/funcs.h @@ -7,7 +7,7 @@ #include "nvim/buffer_defs.h" #include "nvim/cmdexpand_defs.h" #include "nvim/eval/typval_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Prototype of C function that implements Vimscript function typedef void (*VimLFunc)(typval_T *args, typval_T *rvar, EvalFuncData data); diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 036346aed7..25be8ecd62 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -33,7 +33,7 @@ #include "nvim/os/input.h" #include "nvim/pos_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" /// struct storing information about current sort diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h index 252dea2b64..b8466b6943 100644 --- a/src/nvim/eval/typval.h +++ b/src/nvim/eval/typval.h @@ -15,7 +15,7 @@ #include "nvim/macros.h" #include "nvim/mbyte_defs.h" #include "nvim/message.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // In a hashtab item "hi_key" points to "di_key" in a dictitem. // This avoids adding a pointer to the hashtab item. diff --git a/src/nvim/eval/typval_defs.h b/src/nvim/eval/typval_defs.h index 98710d4c51..ea5d70bf19 100644 --- a/src/nvim/eval/typval_defs.h +++ b/src/nvim/eval/typval_defs.h @@ -7,7 +7,7 @@ #include "nvim/hashtab.h" #include "nvim/lib/queue.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Type used for Vimscript VAR_NUMBER values typedef int64_t varnumber_T; diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index 1597f0a524..c095dace92 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -45,7 +45,7 @@ #include "nvim/runtime.h" #include "nvim/search.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/eval/userfunc.h b/src/nvim/eval/userfunc.h index 1c666f72ff..5ad5db80b7 100644 --- a/src/nvim/eval/userfunc.h +++ b/src/nvim/eval/userfunc.h @@ -10,7 +10,7 @@ #include "nvim/garray_defs.h" #include "nvim/hashtab.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" struct funccal_entry; diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 9464e71b87..75274d41af 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -40,7 +40,7 @@ #include "nvim/os/os.h" #include "nvim/search.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/eval/vars.h b/src/nvim/eval/vars.h index 646c6f24e3..849d0c4229 100644 --- a/src/nvim/eval/vars.h +++ b/src/nvim/eval/vars.h @@ -6,7 +6,7 @@ #include "nvim/garray_defs.h" // IWYU pragma: keep #include "nvim/hashtab.h" #include "nvim/option_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "eval/vars.h.generated.h" diff --git a/src/nvim/eval/window.c b/src/nvim/eval/window.c index db19d0c25f..387f524cbb 100644 --- a/src/nvim/eval/window.c +++ b/src/nvim/eval/window.c @@ -23,7 +23,7 @@ #include "nvim/message.h" #include "nvim/move.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" #include "nvim/winfloat.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 802a688ed0..a11d3f0bca 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -81,7 +81,7 @@ #include "nvim/spell.h" #include "nvim/strings.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 58a7fa7d35..e0777a48e5 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -80,7 +80,7 @@ #include "nvim/statusline.h" #include "nvim/strings.h" #include "nvim/tag.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/usercmd.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 7d8d63d569..f302f44dad 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -68,7 +68,7 @@ #include "nvim/search.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/usercmd.h" diff --git a/src/nvim/ex_getln.h b/src/nvim/ex_getln.h index af4593a0d3..7e2a999b7d 100644 --- a/src/nvim/ex_getln.h +++ b/src/nvim/ex_getln.h @@ -7,7 +7,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" #include "nvim/option_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" struct cmdline_info; diff --git a/src/nvim/extmark.h b/src/nvim/extmark.h index 0a2c809532..303ae77a59 100644 --- a/src/nvim/extmark.h +++ b/src/nvim/extmark.h @@ -11,7 +11,7 @@ #include "nvim/macros.h" #include "nvim/marktree.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" EXTERN int extmark_splice_pending INIT( = 0); diff --git a/src/nvim/extmark_defs.h b/src/nvim/extmark_defs.h index d1bc13f9f2..458c80b16b 100644 --- a/src/nvim/extmark_defs.h +++ b/src/nvim/extmark_defs.h @@ -1,7 +1,7 @@ #pragma once #include "klib/kvec.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef struct undo_object ExtmarkUndoObject; typedef kvec_t(ExtmarkUndoObject) extmark_undo_vec_t; diff --git a/src/nvim/file_search.h b/src/nvim/file_search.h index a63711c1fa..ab47445a79 100644 --- a/src/nvim/file_search.h +++ b/src/nvim/file_search.h @@ -3,7 +3,7 @@ #include #include "nvim/globals.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Flags for find_file_*() functions. #define FINDFILE_FILE 0 // only files diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 3d251e1f0a..edebe779d9 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -61,7 +61,7 @@ #include "nvim/sha256.h" #include "nvim/shada.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 1fc3f93c4a..3452a7ae50 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -47,7 +47,7 @@ #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/syntax.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/fold.h b/src/nvim/fold.h index 4b2d2cccee..f902c8c322 100644 --- a/src/nvim/fold.h +++ b/src/nvim/fold.h @@ -7,7 +7,7 @@ #include "nvim/garray_defs.h" // IWYU pragma: keep #include "nvim/macros.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" EXTERN int disable_fold_update INIT( = 0); diff --git a/src/nvim/garray.h b/src/nvim/garray.h index 6bfbb583c4..a96deda759 100644 --- a/src/nvim/garray.h +++ b/src/nvim/garray.h @@ -6,7 +6,7 @@ #include "nvim/garray_defs.h" // IWYU pragma: export #include "nvim/log.h" #include "nvim/memory.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define GA_EMPTY(ga_ptr) ((ga_ptr)->ga_len <= 0) diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index d0007a7a38..21e27541e8 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -54,7 +54,7 @@ #include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h index a1f5d92ffa..612a6d2a0c 100644 --- a/src/nvim/getchar.h +++ b/src/nvim/getchar.h @@ -6,7 +6,7 @@ #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/getchar_defs.h" // IWYU pragma: export #include "nvim/os/fileio.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Argument for flush_buffers(). typedef enum { diff --git a/src/nvim/globals.h b/src/nvim/globals.h index cc66fac48f..d770ac117d 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -16,7 +16,7 @@ #include "nvim/os/os_defs.h" #include "nvim/runtime.h" #include "nvim/syntax_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define IOSIZE (1024 + 1) // file I/O and sprintf buffer size diff --git a/src/nvim/grid.c b/src/nvim/grid.c index e25dcfe4bf..edc7e157c0 100644 --- a/src/nvim/grid.c +++ b/src/nvim/grid.c @@ -27,7 +27,7 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/option_vars.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/grid_defs.h b/src/nvim/grid_defs.h index 990b2959a4..8e8d3ff96f 100644 --- a/src/nvim/grid_defs.h +++ b/src/nvim/grid_defs.h @@ -5,7 +5,7 @@ #include #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Includes final NUL. MAX_MCO is no longer used, but at least 4*(MAX_MCO+1)+1=29 // ensures we can fit all composed chars which did fit before. diff --git a/src/nvim/hashtab.h b/src/nvim/hashtab.h index ca17b36a20..c1981a9160 100644 --- a/src/nvim/hashtab.h +++ b/src/nvim/hashtab.h @@ -2,7 +2,7 @@ #include -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Magic number used for hashitem "hi_key" value indicating a deleted item /// diff --git a/src/nvim/help.c b/src/nvim/help.c index 5123edc2db..0e388d923c 100644 --- a/src/nvim/help.c +++ b/src/nvim/help.c @@ -39,7 +39,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/tag.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/highlight.c b/src/nvim/highlight.c index 0ea95fc60e..9f58890ae0 100644 --- a/src/nvim/highlight.c +++ b/src/nvim/highlight.c @@ -25,7 +25,7 @@ #include "nvim/message.h" #include "nvim/option.h" #include "nvim/popupmenu.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/highlight_defs.h b/src/nvim/highlight_defs.h index 96a38b752f..704c798488 100644 --- a/src/nvim/highlight_defs.h +++ b/src/nvim/highlight_defs.h @@ -3,7 +3,7 @@ #include #include "nvim/macros.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef int32_t RgbValue; diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c index e7518fcde0..e32d16cd1d 100644 --- a/src/nvim/highlight_group.c +++ b/src/nvim/highlight_group.c @@ -40,7 +40,7 @@ #include "nvim/os/time.h" #include "nvim/runtime.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/highlight_group.h b/src/nvim/highlight_group.h index 034de2c533..03e1508539 100644 --- a/src/nvim/highlight_group.h +++ b/src/nvim/highlight_group.h @@ -5,7 +5,7 @@ #include "nvim/api/private/helpers.h" #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep #include "nvim/highlight_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define MAX_HL_ID 20000 // maximum value for a highlight ID. diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 3b3f59f995..2984a0abef 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -38,7 +38,7 @@ #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/textformat.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/indent.h b/src/nvim/indent.h index aa33e7cd93..13288584d9 100644 --- a/src/nvim/indent.h +++ b/src/nvim/indent.h @@ -3,7 +3,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef int (*IndentGetter)(void); diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index bb973a5e1b..3f5c860326 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -57,7 +57,7 @@ #include "nvim/strings.h" #include "nvim/tag.h" #include "nvim/textformat.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/insexpand.h b/src/nvim/insexpand.h index deccc60d4a..3ad0ac05de 100644 --- a/src/nvim/insexpand.h +++ b/src/nvim/insexpand.h @@ -3,7 +3,7 @@ #include "nvim/macros.h" #include "nvim/option_defs.h" // IWYU pragma: keep #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/lua/converter.c b/src/nvim/lua/converter.c index ed8cc3a612..ca4812597e 100644 --- a/src/nvim/lua/converter.c +++ b/src/nvim/lua/converter.c @@ -25,7 +25,7 @@ #include "nvim/lua/executor.h" #include "nvim/macros.h" #include "nvim/message.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" /// Determine, which keys lua table contains diff --git a/src/nvim/lua/executor.h b/src/nvim/lua/executor.h index 91775e0322..6caad4bd7a 100644 --- a/src/nvim/lua/executor.h +++ b/src/nvim/lua/executor.h @@ -14,7 +14,7 @@ #include "nvim/lua/converter.h" #include "nvim/macros.h" #include "nvim/map.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/usercmd.h" // Generated by msgpack-gen.lua diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c index c0815133aa..14658a6bc1 100644 --- a/src/nvim/lua/stdlib.c +++ b/src/nvim/lua/stdlib.c @@ -36,7 +36,7 @@ #include "nvim/pos_defs.h" #include "nvim/regexp.h" #include "nvim/runtime.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/lua/treesitter.c b/src/nvim/lua/treesitter.c index 90767e0c50..fcdd0540e0 100644 --- a/src/nvim/lua/treesitter.c +++ b/src/nvim/lua/treesitter.c @@ -26,7 +26,7 @@ #include "nvim/memory.h" #include "nvim/pos_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define TS_META_PARSER "treesitter_parser" #define TS_META_TREE "treesitter_tree" diff --git a/src/nvim/main.c b/src/nvim/main.c index bcf390ec4c..bed7ae61c8 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -94,7 +94,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_client.h" #include "nvim/ui_compositor.h" diff --git a/src/nvim/map.h b/src/nvim/map.h index 3251a53fdc..38f9107efd 100644 --- a/src/nvim/map.h +++ b/src/nvim/map.h @@ -7,7 +7,7 @@ #include "nvim/api/private/defs.h" #include "nvim/assert.h" #include "nvim/highlight_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #if defined(__NetBSD__) # undef uint64_t diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c index 5d96e678a1..cac0031ff4 100644 --- a/src/nvim/mapping.c +++ b/src/nvim/mapping.c @@ -46,7 +46,7 @@ #include "nvim/runtime.h" #include "nvim/search.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/mapping.h b/src/nvim/mapping.h index 37f09f2625..af614c0276 100644 --- a/src/nvim/mapping.h +++ b/src/nvim/mapping.h @@ -12,7 +12,7 @@ #include "nvim/mapping_defs.h" // IWYU pragma: export #include "nvim/option_defs.h" // IWYU pragma: keep #include "nvim/regexp_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Used for the first argument of do_map() enum { diff --git a/src/nvim/mapping_defs.h b/src/nvim/mapping_defs.h index 80c1edf0f2..8056273a09 100644 --- a/src/nvim/mapping_defs.h +++ b/src/nvim/mapping_defs.h @@ -3,7 +3,7 @@ #include #include "nvim/eval/typval_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Structure used for mappings and abbreviations. typedef struct mapblock mapblock_T; diff --git a/src/nvim/marktree.h b/src/nvim/marktree.h index b55a961c3b..128c6dcf63 100644 --- a/src/nvim/marktree.h +++ b/src/nvim/marktree.h @@ -11,7 +11,7 @@ #include "nvim/garray_defs.h" #include "nvim/map.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // only for debug functions: #include "nvim/api/private/defs.h" diff --git a/src/nvim/match.c b/src/nvim/match.c index aab676c207..4599619a6f 100644 --- a/src/nvim/match.c +++ b/src/nvim/match.c @@ -32,7 +32,7 @@ #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/match.h b/src/nvim/match.h index a4b0dc19b7..e27b6128cd 100644 --- a/src/nvim/match.h +++ b/src/nvim/match.h @@ -3,7 +3,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "match.h.generated.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index e2bae06817..c50331e7d5 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -64,7 +64,7 @@ #include "nvim/os/os.h" #include "nvim/pos_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" typedef struct { diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h index 4e2ba21f47..daeee15fd2 100644 --- a/src/nvim/mbyte.h +++ b/src/nvim/mbyte.h @@ -10,7 +10,7 @@ #include "nvim/grid_defs.h" #include "nvim/mbyte_defs.h" // IWYU pragma: export #include "nvim/os/os_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Return byte length of character that starts with byte "b". // Returns 1 for a single-byte character. diff --git a/src/nvim/memfile_defs.h b/src/nvim/memfile_defs.h index 58ffa8ff74..dd7d4324e1 100644 --- a/src/nvim/memfile_defs.h +++ b/src/nvim/memfile_defs.h @@ -6,7 +6,7 @@ #include "nvim/map.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// A block number. /// diff --git a/src/nvim/memline.h b/src/nvim/memline.h index 2cbe8f753b..77e2abfb6d 100644 --- a/src/nvim/memline.h +++ b/src/nvim/memline.h @@ -3,7 +3,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/memline_defs.h" // IWYU pragma: export #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "memline.h.generated.h" diff --git a/src/nvim/menu.c b/src/nvim/menu.c index d541745112..3d154f53d1 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -33,7 +33,7 @@ #include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/menu.h b/src/nvim/menu.h index 1c59789260..0a9fbf35c4 100644 --- a/src/nvim/menu.h +++ b/src/nvim/menu.h @@ -5,7 +5,7 @@ #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/menu_defs.h" // IWYU pragma: export -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "menu.h.generated.h" diff --git a/src/nvim/message.h b/src/nvim/message.h index 95e83adb63..2f7f67937d 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -9,7 +9,7 @@ #include "nvim/ex_cmds_defs.h" #include "nvim/grid_defs.h" #include "nvim/macros.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Types of dialogs passed to do_dialog(). #define VIM_GENERIC 0 diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c index babd4e353e..b3cbe371ed 100644 --- a/src/nvim/mouse.c +++ b/src/nvim/mouse.c @@ -39,7 +39,7 @@ #include "nvim/state.h" #include "nvim/statusline.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/vim.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index 15164603f2..6451080eae 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -43,7 +43,7 @@ #include "nvim/search.h" #include "nvim/sign_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" #include "nvim/winfloat.h" diff --git a/src/nvim/move.h b/src/nvim/move.h index 575da2f41e..3904b6ffa3 100644 --- a/src/nvim/move.h +++ b/src/nvim/move.h @@ -4,7 +4,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index 25c58b7a83..57c9e64b3b 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -33,7 +33,7 @@ #include "nvim/msgpack_rpc/unpacker.h" #include "nvim/os/input.h" #include "nvim/rbuffer.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_client.h" diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c index 294ce0e298..3aac2618c0 100644 --- a/src/nvim/msgpack_rpc/helpers.c +++ b/src/nvim/msgpack_rpc/helpers.c @@ -13,7 +13,7 @@ #include "nvim/func_attr.h" #include "nvim/memory.h" #include "nvim/msgpack_rpc/helpers.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "msgpack_rpc/helpers.c.generated.h" diff --git a/src/nvim/msgpack_rpc/unpacker.h b/src/nvim/msgpack_rpc/unpacker.h index 0317255df3..53af29761e 100644 --- a/src/nvim/msgpack_rpc/unpacker.h +++ b/src/nvim/msgpack_rpc/unpacker.h @@ -12,7 +12,7 @@ #include "nvim/grid_defs.h" #include "nvim/memory_defs.h" #include "nvim/msgpack_rpc/channel_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui_client.h" struct Unpacker { diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 1144829a17..e31f126834 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -57,7 +57,7 @@ #include "nvim/strings.h" #include "nvim/terminal.h" #include "nvim/textformat.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/ops.h b/src/nvim/ops.h index 391c8d865a..85a6f66011 100644 --- a/src/nvim/ops.h +++ b/src/nvim/ops.h @@ -13,7 +13,7 @@ #include "nvim/option_defs.h" #include "nvim/os/time.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef int (*Indenter)(void); diff --git a/src/nvim/option.c b/src/nvim/option.c index ba38f0f643..972002585e 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -92,7 +92,7 @@ #include "nvim/strings.h" #include "nvim/tag.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/option.h b/src/nvim/option.h index a7d02cc1cd..94aa1d8cec 100644 --- a/src/nvim/option.h +++ b/src/nvim/option.h @@ -9,7 +9,7 @@ #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/option_defs.h" // IWYU pragma: export #include "nvim/search.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// The options that are local to a window or buffer have "indir" set to one of /// these values. Special values: diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 19fab293aa..b2e8081a08 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -6,7 +6,7 @@ #include "nvim/api/private/defs.h" #include "nvim/cmdexpand_defs.h" #include "nvim/regexp_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Option value type typedef enum { diff --git a/src/nvim/option_vars.h b/src/nvim/option_vars.h index ce65750d78..45d9e0c31b 100644 --- a/src/nvim/option_vars.h +++ b/src/nvim/option_vars.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/macros.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // option_vars.h: definition of global variables for settable options diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index 04602e4283..da9f0ae350 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -43,7 +43,7 @@ #include "nvim/spellfile.h" #include "nvim/spellsuggest.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c index 55c12f2986..4aad4c39c6 100644 --- a/src/nvim/os/fileio.c +++ b/src/nvim/os/fileio.c @@ -22,7 +22,7 @@ #include "nvim/os/fs.h" #include "nvim/os/os_defs.h" #include "nvim/rbuffer.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef MSWIN # include "nvim/os/os_win_console.h" diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 4e320a79c4..16151086c7 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -43,7 +43,7 @@ #include "nvim/option_vars.h" #include "nvim/os/os.h" #include "nvim/path.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef HAVE_SYS_UIO_H diff --git a/src/nvim/os/fs.h b/src/nvim/os/fs.h index 3e910be801..8ba0177909 100644 --- a/src/nvim/os/fs.h +++ b/src/nvim/os/fs.h @@ -6,7 +6,7 @@ #include // IWYU pragma: keep #include "nvim/os/fs_defs.h" // IWYU pragma: export -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "os/fs.h.generated.h" diff --git a/src/nvim/os/lang.h b/src/nvim/os/lang.h index dd32378c69..87013ccec9 100644 --- a/src/nvim/os/lang.h +++ b/src/nvim/os/lang.h @@ -2,7 +2,7 @@ #include "nvim/cmdexpand_defs.h" #include "nvim/ex_cmds_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "os/lang.h.generated.h" diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index ead5de32b5..817448d0d2 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -41,7 +41,7 @@ #include "nvim/rbuffer.h" #include "nvim/strings.h" #include "nvim/tag.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/path.h b/src/nvim/path.h index 0116e2ac97..19b6081b42 100644 --- a/src/nvim/path.h +++ b/src/nvim/path.h @@ -4,7 +4,7 @@ #include "nvim/func_attr.h" #include "nvim/garray_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" // Flags for expand_wildcards() #define EW_DIR 0x01 // include directory names diff --git a/src/nvim/plines.c b/src/nvim/plines.c index e900d64715..f4a0daffd6 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -23,7 +23,7 @@ #include "nvim/plines.h" #include "nvim/pos_defs.h" #include "nvim/state.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/profile.c b/src/nvim/profile.c index e65d6ae1d3..8c98700ee2 100644 --- a/src/nvim/profile.c +++ b/src/nvim/profile.c @@ -29,7 +29,7 @@ #include "nvim/pos_defs.h" #include "nvim/profile.h" #include "nvim/runtime.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "profile.c.generated.h" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 6076721d67..6e4d6f39db 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -57,7 +57,7 @@ #include "nvim/regexp.h" #include "nvim/search.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h index 559ae7ff63..2ad92ab6fe 100644 --- a/src/nvim/quickfix.h +++ b/src/nvim/quickfix.h @@ -4,7 +4,7 @@ #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/option_defs.h" // IWYU pragma: keep #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // flags for skip_vimgrep_pat() #define VGR_GLOBAL 1 diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 55442817c1..3e6c7c159b 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -40,7 +40,7 @@ #include "nvim/regexp.h" #include "nvim/regexp_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" // Structure used to save the current input state, when it needs to be diff --git a/src/nvim/regexp.h b/src/nvim/regexp.h index 426ac97493..b618f01e59 100644 --- a/src/nvim/regexp.h +++ b/src/nvim/regexp.h @@ -3,7 +3,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/pos_defs.h" #include "nvim/regexp_defs.h" // IWYU pragma: export -#include "nvim/types.h" +#include "nvim/types_defs.h" // Second argument for vim_regcomp(). #define RE_MAGIC 1 ///< 'magic' option diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h index ab349bfc86..f18bceb486 100644 --- a/src/nvim/regexp_defs.h +++ b/src/nvim/regexp_defs.h @@ -12,7 +12,7 @@ #include #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Used for "magic_overruled". typedef enum { diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c index 491a281d5b..30de776bff 100644 --- a/src/nvim/runtime.c +++ b/src/nvim/runtime.c @@ -52,7 +52,7 @@ #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/usercmd.h" #include "nvim/vim.h" diff --git a/src/nvim/search.h b/src/nvim/search.h index 45432f41f5..949bb41859 100644 --- a/src/nvim/search.h +++ b/src/nvim/search.h @@ -8,7 +8,7 @@ #include "nvim/normal.h" #include "nvim/os/time.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" // Values for the find_pattern_in_path() function args 'type' and 'action': diff --git a/src/nvim/sign.c b/src/nvim/sign.c index e7822b369d..b4cc6a8cea 100644 --- a/src/nvim/sign.c +++ b/src/nvim/sign.c @@ -42,7 +42,7 @@ #include "nvim/sign.h" #include "nvim/sign_defs.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/sign.h b/src/nvim/sign.h index 890c8fdfba..388b447b61 100644 --- a/src/nvim/sign.h +++ b/src/nvim/sign.h @@ -4,7 +4,7 @@ #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/sign_defs.h" // IWYU pragma: export -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "sign.h.generated.h" diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 2839a1c7cb..8033e3d46e 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -103,7 +103,7 @@ #include "nvim/spellsuggest.h" #include "nvim/strings.h" #include "nvim/syntax.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/spellsuggest.c b/src/nvim/spellsuggest.c index 589f828c46..1852f75432 100644 --- a/src/nvim/spellsuggest.c +++ b/src/nvim/spellsuggest.c @@ -43,7 +43,7 @@ #include "nvim/spellfile.h" #include "nvim/spellsuggest.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/vim.h" diff --git a/src/nvim/state.c b/src/nvim/state.c index dfe1af7ab3..1402bff425 100644 --- a/src/nvim/state.c +++ b/src/nvim/state.c @@ -20,7 +20,7 @@ #include "nvim/os/input.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/strings.c b/src/nvim/strings.c index edb463416f..06f5166864 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -27,7 +27,7 @@ #include "nvim/option.h" #include "nvim/plines.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" static const char e_cannot_mix_positional_and_non_positional_str[] diff --git a/src/nvim/strings.h b/src/nvim/strings.h index a2e8d04b30..0b2dc334f9 100644 --- a/src/nvim/strings.h +++ b/src/nvim/strings.h @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/eval/typval_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" /// Append string to string and return pointer to the next byte /// diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index c13b2859ce..cf59b14a9a 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -43,7 +43,7 @@ #include "nvim/runtime.h" #include "nvim/strings.h" #include "nvim/syntax.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" static bool did_syntax_onoff = false; diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 28f532d986..4cbba9a14f 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -82,7 +82,7 @@ #include "nvim/pos_defs.h" #include "nvim/state.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/vim.h" diff --git a/src/nvim/testing.c b/src/nvim/testing.c index 31addfc1e3..5cc8e0c31d 100644 --- a/src/nvim/testing.c +++ b/src/nvim/testing.c @@ -25,7 +25,7 @@ #include "nvim/runtime.h" #include "nvim/strings.h" #include "nvim/testing.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" /// Type of assert_* check being performed diff --git a/src/nvim/testing.h b/src/nvim/testing.h index 563ce21302..2e1c74fb22 100644 --- a/src/nvim/testing.h +++ b/src/nvim/testing.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/eval/typval_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "testing.h.generated.h" diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h index 2474e1b9b4..2743a5e286 100644 --- a/src/nvim/tui/input.h +++ b/src/nvim/tui/input.h @@ -11,7 +11,7 @@ #include "nvim/rbuffer.h" #include "nvim/tui/input_defs.h" // IWYU pragma: export #include "nvim/tui/tui.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef enum { kKeyEncodingLegacy, ///< Legacy key encoding diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index dbc1187273..3b00afed40 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -33,7 +33,7 @@ #include "nvim/tui/input.h" #include "nvim/tui/terminfo.h" #include "nvim/tui/tui.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ugrid.h" #include "nvim/ui.h" #include "nvim/ui_client.h" diff --git a/src/nvim/types.h b/src/nvim/types_defs.h similarity index 100% rename from src/nvim/types.h rename to src/nvim/types_defs.h diff --git a/src/nvim/ui.h b/src/nvim/ui.h index e54c3f2435..0dc53e4ecc 100644 --- a/src/nvim/ui.h +++ b/src/nvim/ui.h @@ -10,7 +10,7 @@ #include "nvim/highlight_defs.h" #include "nvim/macros.h" #include "nvim/memory.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" struct ui_t; diff --git a/src/nvim/ui_client.h b/src/nvim/ui_client.h index 4fcccf04b2..383f69c5f7 100644 --- a/src/nvim/ui_client.h +++ b/src/nvim/ui_client.h @@ -7,7 +7,7 @@ #include "nvim/api/private/defs.h" #include "nvim/grid_defs.h" #include "nvim/macros.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef struct { const char *name; diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c index b243e1088b..18234818f3 100644 --- a/src/nvim/ui_compositor.c +++ b/src/nvim/ui_compositor.c @@ -24,7 +24,7 @@ #include "nvim/message.h" #include "nvim/option_vars.h" #include "nvim/os/time.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/vim.h" diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 74f2d2139a..9b6e2d7939 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -122,7 +122,7 @@ #include "nvim/spell.h" #include "nvim/state.h" #include "nvim/strings.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo.h" #include "nvim/undo_defs.h" #include "nvim/vim.h" diff --git a/src/nvim/undo.h b/src/nvim/undo.h index 19de86a158..13b6486a17 100644 --- a/src/nvim/undo.h +++ b/src/nvim/undo.h @@ -3,7 +3,7 @@ #include "nvim/buffer_defs.h" // IWYU pragma: keep #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/undo_defs.h" // IWYU pragma: export #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/usercmd.h b/src/nvim/usercmd.h index 09b5dac958..73bb5b9279 100644 --- a/src/nvim/usercmd.h +++ b/src/nvim/usercmd.h @@ -6,7 +6,7 @@ #include "nvim/eval/typval_defs.h" #include "nvim/ex_cmds_defs.h" // IWYU pragma: keep #include "nvim/garray_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" typedef struct ucmd { char *uc_name; // The command name diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 2208259de4..8de59aa2f9 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -1,7 +1,7 @@ #pragma once #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Some defines from the old feature.h #define SESSION_FILE "Session.vim" diff --git a/src/nvim/viml/parser/expressions.c b/src/nvim/viml/parser/expressions.c index 82e01f7d9c..804f78b2b7 100644 --- a/src/nvim/viml/parser/expressions.c +++ b/src/nvim/viml/parser/expressions.c @@ -64,7 +64,7 @@ #include "nvim/macros.h" #include "nvim/mbyte.h" #include "nvim/memory.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/vim.h" #include "nvim/viml/parser/expressions.h" #include "nvim/viml/parser/parser.h" diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h index cc0aeff322..94287ea4e1 100644 --- a/src/nvim/viml/parser/expressions.h +++ b/src/nvim/viml/parser/expressions.h @@ -5,7 +5,7 @@ #include #include "nvim/eval/typval_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/viml/parser/parser.h" struct expr_ast_node; diff --git a/src/nvim/window.c b/src/nvim/window.c index cb2f3a79f4..d4cb692148 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -68,7 +68,7 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #include "nvim/ui.h" #include "nvim/ui_compositor.h" #include "nvim/undo.h" diff --git a/src/nvim/window.h b/src/nvim/window.h index e38fb953ab..bc3ec6adb9 100644 --- a/src/nvim/window.h +++ b/src/nvim/window.h @@ -6,7 +6,7 @@ #include "nvim/garray_defs.h" // IWYU pragma: keep #include "nvim/macros.h" #include "nvim/option_defs.h" // IWYU pragma: keep -#include "nvim/types.h" +#include "nvim/types_defs.h" // Values for file_name_in_line() #define FNAME_MESS 1 // give error message