Merge pull request #35206 from bfredl/nopreproc_cleanup

refactor(build): remove INCLUDE_GENERATED_DECLARATIONS guards

build.zig

@@ -304,7 +304,6 @@ pub fn build(b: *std.Build) !void {
 
     const flags = [_][]const u8{
         "-std=gnu99",
-        "-DINCLUDE_GENERATED_DECLARATIONS",
         "-DZIG_BUILD",
         "-D_GNU_SOURCE",
         if (support_unittests) "-DUNIT_TESTING" else "",

runtime/doc/dev_style.txt

@@ -255,8 +255,7 @@ functions. >c
 
 Integration with declarations generator ~
 
-Every C file must contain #include of the generated header file, guarded by
-#ifdef INCLUDE_GENERATED_DECLARATIONS.
+Every C file must contain #include of the generated header file.
 
 Include must go after other #includes and typedefs in .c files and after
 everything else in header files. It is allowed to omit #include in a .c file
@@ -272,9 +271,7 @@ contain only non-static function declarations. >c
 
     typedef int FooType;
 
-    #ifdef INCLUDE_GENERATED_DECLARATIONS
-    # include "foo.c.generated.h"
-    #endif
+    #include "foo.c.generated.h"
 
     …
 
@@ -284,9 +281,7 @@ contain only non-static function declarations. >c
 
     …
 
-    #ifdef INCLUDE_GENERATED_DECLARATIONS
-    # include "foo.h.generated.h"
-    #endif
+    #include "foo.h.generated.h"
 
 
 64-bit Portability ~

src/nvim/CMakeLists.txt

@@ -180,8 +180,6 @@ if(HAS_DIAG_COLOR_FLAG)
   endif()
 endif()
 
-target_compile_definitions(main_lib INTERFACE INCLUDE_GENERATED_DECLARATIONS)
-
 # Remove --sort-common from linker flags, as this seems to cause bugs (see #2641, #3374).
 # TODO: Figure out the root cause.
 if(CMAKE_EXE_LINKER_FLAGS MATCHES "--sort-common" OR
@@ -911,8 +909,14 @@ add_glob_target(
   FLAGS -c ${UNCRUSTIFY_CONFIG} --replace --no-backup
   FILES ${NVIM_SOURCES} ${NVIM_HEADERS})
 
-add_dependencies(lintc-uncrustify uncrustify_update_config)
-add_dependencies(formatc uncrustify_update_config)
+# TODO(bfredl): there is a bug in "uncrustify --update-config-with-doc" which breaks
+# our config (backslash escape in strings). Once fixed these two lines should be deleted
+# and the following two commented lines be uncomennetd.
+add_dependencies(lintc-uncrustify uncrustify)
+add_dependencies(formatc uncrustify)
+#add_dependencies(lintc-uncrustify uncrustify_update_config)
+#add_dependencies(formatc uncrustify_update_config)
+
 add_dependencies(uncrustify_update_config uncrustify)
 
 add_custom_target(lintc)

src/nvim/api/autocmd.c

@@ -27,9 +27,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/autocmd.c.generated.h"
-#endif
+#include "api/autocmd.c.generated.h"
 
 #define AUCMD_MAX_PATTERNS 256
 

src/nvim/api/autocmd.h

@@ -5,6 +5,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/autocmd.h.generated.h"
-#endif
+#include "api/autocmd.h.generated.h"

src/nvim/api/buffer.c

@@ -46,9 +46,7 @@
 #include "nvim/undo_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/buffer.c.generated.h"
-#endif
+#include "api/buffer.c.generated.h"
 
 /// @brief <pre>help
 /// For more information on buffers, see |buffers|.

src/nvim/api/buffer.h

@@ -8,6 +8,4 @@
 #include "nvim/pos_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/buffer.h.generated.h"
-#endif
+#include "api/buffer.h.generated.h"

src/nvim/api/command.c

@@ -37,9 +37,7 @@
 #include "nvim/vim_defs.h"
 #include "nvim/window.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/command.c.generated.h"
-#endif
+#include "api/command.c.generated.h"
 
 /// Parse arguments for :map/:abbrev commands, preserving whitespace in RHS.
 /// @param arg_str  The argument string to parse

src/nvim/api/command.h

@@ -5,6 +5,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/command.h.generated.h"
-#endif
+#include "api/command.h.generated.h"

src/nvim/api/deprecated.c

@@ -31,9 +31,7 @@
 #include "nvim/strings.h"
 #include "nvim/types_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/deprecated.c.generated.h"
-#endif
+#include "api/deprecated.c.generated.h"
 
 /// @deprecated Use nvim_exec2() instead.
 /// @see nvim_exec2

src/nvim/api/deprecated.h

@@ -5,6 +5,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/deprecated.h.generated.h"
-#endif
+#include "api/deprecated.h.generated.h"

src/nvim/api/extmark.c

@@ -32,9 +32,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/sign.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/extmark.c.generated.h"
-#endif
+#include "api/extmark.c.generated.h"
 
 void api_extmark_free_all_mem(void)
 {

src/nvim/api/extmark.h

@@ -28,6 +28,4 @@ static inline bool ns_in_win(uint32_t ns_id, win_T *wp)
   return set_has(uint32_t, &wp->w_ns_set, ns_id);
 }
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/extmark.h.generated.h"
-#endif
+#include "api/extmark.h.generated.h"

src/nvim/api/options.c

@@ -19,9 +19,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/options.c.generated.h"
-#endif
+#include "api/options.c.generated.h"
 
 static int validate_option_value_args(Dict(option) *opts, char *name, OptIndex *opt_idxp,
                                       int *opt_flags, OptScope *scope, void **from, char **filetype,

src/nvim/api/options.h

@@ -6,6 +6,4 @@
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 #include "nvim/option_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/options.h.generated.h"
-#endif
+#include "api/options.h.generated.h"

src/nvim/api/private/converter.c

@@ -26,9 +26,7 @@ typedef struct {
   bool reuse_strdata;
 } EncodedData;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/converter.c.generated.h"
-#endif
+#include "api/private/converter.c.generated.h"
 
 #define TYPVAL_ENCODE_ALLOW_SPECIALS false
 #define TYPVAL_ENCODE_CHECK_BEFORE

src/nvim/api/private/converter.h

@@ -3,6 +3,4 @@
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/converter.h.generated.h"
-#endif
+#include "api/private/converter.h.generated.h"

src/nvim/api/private/defs.h

@@ -15,19 +15,17 @@
 
 #define ERROR_SET(e) ((e)->type != kErrorTypeNone)
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# define ArrayOf(...) Array
-# define DictOf(...) Dict
-# define DictAs(name) Dict
-# define Dict(name) KeyDict_##name
-# define Enum(...) String
-# define DictHash(name) KeyDict_##name##_get_field
-# define DictKey(name)
-# define LuaRefOf(...) LuaRef
-# define Union(...) Object
-# define Tuple(...) Array
-# include "api/private/defs.h.inline.generated.h"
-#endif
+#define ArrayOf(...) Array
+#define DictOf(...) Dict
+#define DictAs(name) Dict
+#define Dict(name) KeyDict_##name
+#define Enum(...) String
+#define DictHash(name) KeyDict_##name##_get_field
+#define DictKey(name)
+#define LuaRefOf(...) LuaRef
+#define Union(...) Object
+#define Tuple(...) Array
+#include "api/private/defs.h.inline.generated.h"
 
 // Basic types
 typedef enum {

src/nvim/api/private/dispatch.c

@@ -4,9 +4,7 @@
 #include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/dispatch_wrappers.generated.h"
-#endif
+#include "api/private/dispatch_wrappers.generated.h"
 
 /// @param name API method name
 /// @param name_len name size (includes terminating NUL)

src/nvim/api/private/dispatch.h

@@ -24,8 +24,6 @@ struct MsgpackRpcRequestHandler {
 
 extern const MsgpackRpcRequestHandler method_handlers[];
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/dispatch.h.generated.h"
-# include "api/private/dispatch_wrappers.h.generated.h"
-# include "keysets_defs.generated.h"
-#endif
+#include "api/private/dispatch.h.generated.h"
+#include "api/private/dispatch_wrappers.h.generated.h"
+#include "keysets_defs.generated.h"

src/nvim/api/private/helpers.c

@@ -33,10 +33,8 @@
 #include "nvim/runtime.h"
 #include "nvim/types_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/api_metadata.generated.h"
-# include "api/private/helpers.c.generated.h"  // IWYU pragma: keep
-#endif
+#include "api/private/api_metadata.generated.h"
+#include "api/private/helpers.c.generated.h"  // IWYU pragma: keep
 
 /// Start block that may cause Vimscript exceptions while evaluating another code
 ///

src/nvim/api/private/helpers.h

@@ -180,9 +180,7 @@ typedef struct {
     code; \
   }
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/helpers.h.generated.h"
-#endif
+#include "api/private/helpers.h.generated.h"
 
 #define WITH_SCRIPT_CONTEXT(channel_id, code) \
   do { \

src/nvim/api/private/validate.h

@@ -91,6 +91,4 @@
 #define VALIDATE_R(cond, name, code) \
   VALIDATE(cond, "Required: '%s'", name, code);
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/private/validate.h.generated.h"
-#endif
+#include "api/private/validate.h.generated.h"

src/nvim/api/tabpage.c

@@ -11,9 +11,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/window.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/tabpage.c.generated.h"  // IWYU pragma: keep
-#endif
+#include "api/tabpage.c.generated.h"  // IWYU pragma: keep
 
 /// Gets the windows in a tabpage
 ///

src/nvim/api/tabpage.h

@@ -2,6 +2,4 @@
 
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/tabpage.h.generated.h"
-#endif
+#include "api/tabpage.h.generated.h"

src/nvim/api/ui.c

@@ -42,10 +42,8 @@
 
 #define BUF_POS(ui) ((size_t)((ui)->packer.ptr - (ui)->packer.startptr))
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/ui.c.generated.h"
-# include "ui_events_remote.generated.h"  // IWYU pragma: export
-#endif
+#include "api/ui.c.generated.h"
+#include "ui_events_remote.generated.h"  // IWYU pragma: export
 
 // TODO(bfredl): just make UI:s owned by their channels instead
 static PMap(uint64_t) connected_uis = MAP_INIT;

src/nvim/api/ui.h

@@ -22,7 +22,5 @@ EXTERN const char *ui_ext_names[] INIT( = {
   "_debug_float",
 });
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/ui.h.generated.h"
-# include "ui_events_remote.h.generated.h"
-#endif
+#include "api/ui.h.generated.h"
+#include "ui_events_remote.h.generated.h"

src/nvim/api/ui_events.in.h

@@ -1,9 +1,7 @@
 #pragma once
 
 // This file is not compiled, just parsed for definitions
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# error "don't include this file, include nvim/ui.h"
-#endif
+#error "don't include this file, include nvim/ui.h"
 
 #include "nvim/api/private/defs.h"
 #include "nvim/func_attr.h"

src/nvim/api/vim.c

@@ -86,9 +86,7 @@
 #include "nvim/vim_defs.h"
 #include "nvim/window.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/vim.c.generated.h"
-#endif
+#include "api/vim.c.generated.h"
 
 /// Gets a highlight group by name
 ///

src/nvim/api/vim.h

@@ -5,6 +5,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/vim.h.generated.h"
-#endif
+#include "api/vim.h.generated.h"

src/nvim/api/vimscript.c

@@ -29,9 +29,7 @@
 #include "nvim/viml/parser/parser.h"
 #include "nvim/viml/parser/parser_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/vimscript.c.generated.h"
-#endif
+#include "api/vimscript.c.generated.h"
 
 /// Executes Vimscript (multiline block of Ex commands), like anonymous
 /// |:source|.

src/nvim/api/vimscript.h

@@ -5,6 +5,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/vimscript.h.generated.h"
-#endif
+#include "api/vimscript.h.generated.h"

src/nvim/api/win_config.c

@@ -36,9 +36,7 @@
 #include "nvim/window.h"
 #include "nvim/winfloat.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/win_config.c.generated.h"
-#endif
+#include "api/win_config.c.generated.h"
 
 /// Opens a new split window, or a floating window if `relative` is specified,
 /// or an external window (managed by the UI) if `external` is specified.

src/nvim/api/win_config.h

@@ -6,6 +6,4 @@
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 #include "nvim/buffer_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/win_config.h.generated.h"
-#endif
+#include "api/win_config.h.generated.h"

src/nvim/api/window.c

@@ -26,9 +26,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/window.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/window.c.generated.h"  // IWYU pragma: keep
-#endif
+#include "api/window.c.generated.h"  // IWYU pragma: keep
 
 /// Gets the current buffer in a window
 ///

src/nvim/api/window.h

@@ -3,6 +3,4 @@
 #include "nvim/api/keysets_defs.h"  // IWYU pragma: keep
 #include "nvim/api/private/defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "api/window.h.generated.h"
-#endif
+#include "api/window.h.generated.h"

src/nvim/arabic.c

@@ -158,9 +158,7 @@ static struct achar {
 
 #define a_BYTE_ORDER_MARK               0xfeff
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "arabic.c.generated.h"
-#endif
+#include "arabic.c.generated.h"
 
 /// Find the struct achar pointer to the given Arabic char.
 /// Returns NULL if not found.

src/nvim/arabic.h

@@ -4,6 +4,4 @@
 
 #define ARABIC_CHAR(ch)            (((ch) & 0xFF00) == 0x0600)
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "arabic.h.generated.h"
-#endif
+#include "arabic.h.generated.h"

src/nvim/arglist.c

@@ -64,9 +64,7 @@ typedef struct {
   tabpage_T *new_curtab;
 } arg_all_state_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "arglist.c.generated.h"
-#endif
+#include "arglist.c.generated.h"
 
 static const char e_window_layout_changed_unexpectedly[]
   = N_("E249: Window layout changed unexpectedly");

src/nvim/arglist.h

@@ -4,6 +4,4 @@
 #include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "arglist.h.generated.h"
-#endif
+#include "arglist.h.generated.h"

src/nvim/ascii_defs.h

@@ -4,9 +4,7 @@
 
 #include "nvim/os/os_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "ascii_defs.h.inline.generated.h"
-#endif
+#include "ascii_defs.h.inline.generated.h"
 
 // Definitions of various common control characters.
 

src/nvim/autocmd.c

@@ -7,9 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "klib/kvec.h"
-#include "nvim/api/private/helpers.h"
-#include "nvim/ascii_defs.h"
 #include "nvim/autocmd.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
@@ -63,10 +60,8 @@
 #include "nvim/window.h"
 #include "nvim/winfloat.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "auevents_name_map.generated.h"
-# include "autocmd.c.generated.h"
-#endif
+#include "auevents_name_map.generated.h"
+#include "autocmd.c.generated.h"
 
 static const char e_autocommand_nesting_too_deep[]
   = N_("E218: Autocommand nesting too deep");

src/nvim/autocmd.h

@@ -68,6 +68,4 @@ enum { BUFLOCAL_PAT_LEN = 25, };
 #define FOR_ALL_AUEVENTS(event) \
   for (event_T event = (event_T)0; (int)event < (int)NUM_EVENTS; event = (event_T)((int)event + 1))
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "autocmd.h.generated.h"
-#endif
+#include "autocmd.h.generated.h"

src/nvim/autocmd_defs.h

@@ -7,9 +7,7 @@
 #include "nvim/buffer_defs.h"
 #include "nvim/ex_cmds_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "auevents_enum.generated.h"
-#endif
+#include "auevents_enum.generated.h"
 
 /// Struct to save values in before executing autocommands for a buffer that is
 /// not the current buffer.

src/nvim/base64.c

@@ -12,9 +12,7 @@
 # include ENDIAN_INCLUDE_FILE
 #endif
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "base64.c.generated.h"
-#endif
+#include "base64.c.generated.h"
 
 static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

src/nvim/base64.h

@@ -2,6 +2,4 @@
 
 #include <stddef.h>  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "base64.h.generated.h"
-#endif
+#include "base64.h.generated.h"

src/nvim/buffer.c

@@ -115,9 +115,7 @@
 #include "nvim/window.h"
 #include "nvim/winfloat.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "buffer.c.generated.h"
-#endif
+#include "buffer.c.generated.h"
 
 static const char e_attempt_to_delete_buffer_that_is_in_use_str[]
   = N_("E937: Attempt to delete a buffer that is in use: %s");

src/nvim/buffer.h

@@ -73,10 +73,8 @@ enum bfa_values {
 EXTERN char *msg_loclist INIT( = N_("[Location List]"));
 EXTERN char *msg_qflist INIT( = N_("[Quickfix List]"));
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "buffer.h.generated.h"
-# include "buffer.h.inline.generated.h"
-#endif
+#include "buffer.h.generated.h"
+#include "buffer.h.inline.generated.h"
 
 /// Get b:changedtick value
 ///

src/nvim/buffer_updates.c

@@ -21,9 +21,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/types_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "buffer_updates.c.generated.h"  // IWYU pragma: keep
-#endif
+#include "buffer_updates.c.generated.h"  // IWYU pragma: keep
 
 // Register a channel. Return True if the channel was added, or already added.
 // Return False if the channel couldn't be added because the buffer is

src/nvim/buffer_updates.h

@@ -6,6 +6,4 @@
 #include "nvim/extmark_defs.h"  // IWYU pragma: keep
 #include "nvim/pos_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "buffer_updates.h.generated.h"
-#endif
+#include "buffer_updates.h.generated.h"

src/nvim/bufwrite.c

@@ -91,9 +91,7 @@ struct bw_info {
   iconv_t bw_iconv_fd;            // descriptor for iconv() or -1
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "bufwrite.c.generated.h"
-#endif
+#include "bufwrite.c.generated.h"
 
 /// Convert a Unicode character to bytes.
 ///

src/nvim/bufwrite.h

@@ -4,6 +4,4 @@
 #include "nvim/pos_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "bufwrite.h.generated.h"
-#endif
+#include "bufwrite.h.generated.h"

src/nvim/change.c

@@ -56,9 +56,7 @@
 #include "nvim/undo.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "change.c.generated.h"
-#endif
+#include "change.c.generated.h"
 
 /// If the file is readonly, give a warning message with the first change.
 /// Don't do this for autocommands.

src/nvim/change.h

@@ -16,6 +16,4 @@ enum {
   OPENLINE_FORCE_INDENT = 0x40,  ///< use second_line_indent without indent logic
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "change.h.generated.h"
-#endif
+#include "change.h.generated.h"

src/nvim/channel.c

@@ -58,9 +58,7 @@ static bool did_stdio = false;
 /// 2 is reserved for stderr channel
 static uint64_t next_chan_id = CHAN_STDERR + 1;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "channel.c.generated.h"
-#endif
+#include "channel.c.generated.h"
 
 /// Teardown the module
 void channel_teardown(void)

src/nvim/channel.h

@@ -46,10 +46,8 @@ struct Channel {
   bool callback_scheduled;
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "channel.h.generated.h"
-# include "channel.h.inline.generated.h"
-#endif
+#include "channel.h.generated.h"
+#include "channel.h.inline.generated.h"
 
 static inline bool callback_reader_set(CallbackReader reader)
 {

src/nvim/charset.c

@@ -31,9 +31,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "charset.c.generated.h"
-#endif
+#include "charset.c.generated.h"
 
 static bool chartab_initialized = false;
 

src/nvim/charset.h

@@ -28,10 +28,8 @@ typedef enum {
   STR2NR_QUOTE = (1 << 4),  ///< Ignore embedded single quotes.
 } ChStr2NrFlags;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "charset.h.generated.h"
-# include "charset.h.inline.generated.h"
-#endif
+#include "charset.h.generated.h"
+#include "charset.h.inline.generated.h"
 
 /// Check if `c` is one of the characters in 'breakat'.
 /// Used very often if 'linebreak' is set

src/nvim/cmdexpand.c

@@ -81,9 +81,7 @@
 /// Type used by call_user_expand_func
 typedef void *(*user_expand_func_T)(const char *, int, typval_T *);
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cmdexpand.c.generated.h"
-#endif
+#include "cmdexpand.c.generated.h"
 
 static bool cmd_showtail;  ///< Only show path tail in lists ?
 static bool may_expand_pattern = false;

src/nvim/cmdexpand.h

@@ -45,6 +45,4 @@ enum {
   WILD_FUNC_TRIGGER         = 0x10000,  ///< called from wildtrigger()
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cmdexpand.h.generated.h"
-#endif
+#include "cmdexpand.h.generated.h"

src/nvim/cmdhist.c

@@ -30,9 +30,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cmdhist.c.generated.h"
-#endif
+#include "cmdhist.c.generated.h"
 
 static histentry_T *(history[HIST_COUNT]) = { NULL, NULL, NULL, NULL, NULL };
 static int hisidx[HIST_COUNT] = { -1, -1, -1, -1, -1 };  ///< lastused entry

src/nvim/cmdhist.h

@@ -30,6 +30,4 @@ typedef struct {
   AdditionalData *additional_data;  ///< Additional entries from ShaDa file.
 } histentry_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cmdhist.h.generated.h"
-#endif
+#include "cmdhist.h.generated.h"

src/nvim/context.c

@@ -25,9 +25,7 @@
 #include "nvim/option_defs.h"
 #include "nvim/shada.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "context.c.generated.h"
-#endif
+#include "context.c.generated.h"
 
 int kCtxAll = (kCtxRegs | kCtxJumps | kCtxBufs | kCtxGVars | kCtxSFuncs
                | kCtxFuncs);

src/nvim/context.h

@@ -33,6 +33,4 @@ typedef enum {
 
 extern int kCtxAll;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "context.h.generated.h"
-#endif
+#include "context.h.generated.h"

src/nvim/cursor.c

@@ -27,9 +27,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cursor.c.generated.h"
-#endif
+#include "cursor.c.generated.h"
 
 /// @return  the screen position of the cursor.
 int getviscol(void)

src/nvim/cursor.h

@@ -3,6 +3,4 @@
 #include "nvim/pos_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cursor.h.generated.h"
-#endif
+#include "cursor.h.generated.h"

src/nvim/cursor_shape.c

@@ -18,9 +18,7 @@
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cursor_shape.c.generated.h"
-#endif
+#include "cursor_shape.c.generated.h"
 
 static const char e_digit_expected[] = N_("E548: Digit expected");
 

src/nvim/cursor_shape.h

@@ -55,6 +55,4 @@ typedef struct {
 
 extern cursorentry_T shape_table[SHAPE_IDX_COUNT];
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "cursor_shape.h.generated.h"
-#endif
+#include "cursor_shape.h.generated.h"

src/nvim/debugger.c

@@ -61,9 +61,7 @@ struct debuggy {
   int dbg_level;                ///< stored nested level for expr
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "debugger.c.generated.h"
-#endif
+#include "debugger.c.generated.h"
 
 /// Debug mode. Repeatedly get Ex commands, until told to continue normal
 /// execution.

src/nvim/debugger.h

@@ -2,6 +2,4 @@
 
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "debugger.h.generated.h"
-#endif
+#include "debugger.h.generated.h"

src/nvim/decoration.c

@@ -28,9 +28,7 @@
 #include "nvim/pos_defs.h"
 #include "nvim/sign.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "decoration.c.generated.h"
-#endif
+#include "decoration.c.generated.h"
 
 uint32_t decor_freelist = UINT32_MAX;
 

src/nvim/decoration.h

@@ -104,10 +104,8 @@ EXTERN DecorState decor_state INIT( = { 0 });
 // associated with a buffer can be freed when the buffer is unloaded.
 EXTERN kvec_t(DecorSignHighlight) decor_items INIT( = KV_INITIAL_VALUE);
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "decoration.h.generated.h"
-# include "decoration.h.inline.generated.h"
-#endif
+#include "decoration.h.generated.h"
+#include "decoration.h.inline.generated.h"
 
 static inline int decor_redraw_col(win_T *wp, int col, int win_col, bool hidden, DecorState *state)
   FUNC_ATTR_ALWAYS_INLINE

src/nvim/decoration_provider.c

@@ -19,9 +19,7 @@
 #include "nvim/move.h"
 #include "nvim/pos_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "decoration_provider.c.generated.h"
-#endif
+#include "decoration_provider.c.generated.h"
 
 static kvec_t(DecorProvider) decor_providers = KV_INITIAL_VALUE;
 

src/nvim/decoration_provider.h

@@ -6,6 +6,4 @@
 #include "nvim/macros_defs.h"
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "decoration_provider.h.generated.h"
-#endif
+#include "decoration_provider.h.generated.h"

src/nvim/diff.c

@@ -142,9 +142,7 @@ typedef enum {
   DIFF_NONE,
 } diffstyle_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "diff.c.generated.h"
-#endif
+#include "diff.c.generated.h"
 
 #define FOR_ALL_DIFFBLOCKS_IN_TAB(tp, dp) \
   for ((dp) = (tp)->tp_first_diff; (dp) != NULL; (dp) = (dp)->df_next)

src/nvim/diff.h

@@ -14,6 +14,4 @@ EXTERN bool diff_need_scrollbind INIT( = false);
 
 EXTERN bool need_diff_redraw INIT( = false);  ///< need to call diff_redraw()
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "diff.h.generated.h"
-#endif
+#include "diff.h.generated.h"

src/nvim/digraph.c

@@ -53,9 +53,7 @@ static const char e_digraph_argument_must_be_one_character_str[]
 static const char e_digraph_setlist_argument_must_be_list_of_lists_with_two_items[]
   = N_("E1216: digraph_setlist() argument must be a list of lists with two items");
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "digraph.c.generated.h"
-#endif
+#include "digraph.c.generated.h"
 // digraphs added by the user
 static garray_T user_digraphs = { 0, 0, (int)sizeof(digr_T), 10, NULL };
 

src/nvim/digraph.h

@@ -5,6 +5,4 @@
 #include "nvim/garray_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "digraph.h.generated.h"
-#endif
+#include "digraph.h.generated.h"

src/nvim/drawline.c

@@ -130,9 +130,7 @@ typedef struct {
   int *color_cols;           ///< if not NULL, highlight colorcolumn using according columns array
 } winlinevars_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "drawline.c.generated.h"
-#endif
+#include "drawline.c.generated.h"
 
 static char *extra_buf = NULL;
 static size_t extra_buf_size = 0;

src/nvim/drawline.h

@@ -30,6 +30,4 @@ typedef struct {
   linenr_T spv_capcol_lnum;   ///< line number for "cap_col"
 } spellvars_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "drawline.h.generated.h"
-#endif
+#include "drawline.h.generated.h"

src/nvim/drawscreen.c

@@ -128,9 +128,7 @@ typedef enum {
   WC_BOTTOM_RIGHT,
 } WindowCorner;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "drawscreen.c.generated.h"
-#endif
+#include "drawscreen.c.generated.h"
 
 static bool redraw_popupmenu = false;
 static bool msg_grid_invalid = false;

src/nvim/drawscreen.h

@@ -35,6 +35,4 @@ EXTERN linenr_T search_hl_has_cursor_lnum INIT( = 0);
 #define W_ENDCOL(wp)   ((wp)->w_wincol + (wp)->w_width)
 #define W_ENDROW(wp)   ((wp)->w_winrow + (wp)->w_height)
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "drawscreen.h.generated.h"
-#endif
+#include "drawscreen.h.generated.h"

src/nvim/edit.c

@@ -102,9 +102,7 @@ typedef struct {
   bool nomove;
 } InsertState;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "edit.c.generated.h"
-#endif
+#include "edit.c.generated.h"
 enum {
   BACKSPACE_CHAR = 1,
   BACKSPACE_WORD = 2,

src/nvim/edit.h

@@ -34,6 +34,4 @@ enum {
   INSCHAR_COM_LIST = 16,  ///< format comments with list/2nd line indent
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "edit.h.generated.h"
-#endif
+#include "edit.h.generated.h"

src/nvim/eval.c

@@ -315,9 +315,7 @@ typedef enum {
   FILTERMAP_FOREACH,
 } filtermap_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval.c.generated.h"
-#endif
+#include "eval.c.generated.h"
 
 static uint64_t last_timer_id = 1;
 static PMap(uint64_t) timers = MAP_INIT;

src/nvim/eval.h

@@ -253,6 +253,4 @@ enum {
 /// Passed to an eval() function to enable evaluation.
 EXTERN evalarg_T EVALARG_EVALUATE INIT( = { EVAL_EVALUATE, NULL, NULL, NULL });
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval.h.generated.h"
-#endif
+#include "eval.h.generated.h"

src/nvim/eval/buffer.c

@@ -36,9 +36,7 @@ typedef struct {
   int cob_save_VIsual_active;
 } cob_T;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/buffer.c.generated.h"
-#endif
+#include "eval/buffer.c.generated.h"
 
 /// Find a buffer by number or exact name.
 buf_T *find_buffer(typval_T *avar)

src/nvim/eval/buffer.h

@@ -4,6 +4,4 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/buffer.h.generated.h"
-#endif
+#include "eval/buffer.h.generated.h"

src/nvim/eval/decode.c

@@ -51,9 +51,7 @@ typedef kvec_t(ValuesStackItem) ValuesStack;
 /// Vector containing containers, each next container is located inside previous
 typedef kvec_t(ContainerStackItem) ContainerStack;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/decode.c.generated.h"
-#endif
+#include "eval/decode.c.generated.h"
 
 /// Create special dictionary
 ///

src/nvim/eval/decode.h

@@ -6,6 +6,4 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/decode.h.generated.h"
-#endif
+#include "eval/decode.h.generated.h"

src/nvim/eval/deprecated.c

@@ -14,9 +14,7 @@
 #include "nvim/message.h"           // for semsg
 #include "nvim/types_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/deprecated.c.generated.h"  // IWYU pragma: keep
-#endif
+#include "eval/deprecated.c.generated.h"  // IWYU pragma: keep
 
 /// "rpcstart()" function (DEPRECATED)
 void f_rpcstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)

src/nvim/eval/deprecated.h

@@ -3,6 +3,4 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/deprecated.h.generated.h"
-#endif
+#include "eval/deprecated.h.generated.h"

src/nvim/eval/encode.c

@@ -42,9 +42,7 @@ const char *const encode_special_var_names[] = {
   [kSpecialVarNull] = "v:null",
 };
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/encode.c.generated.h"
-#endif
+#include "eval/encode.c.generated.h"
 
 /// Msgpack callback for writing to a Blob
 int encode_blob_write(void *const data, const char *const buf, const size_t len)

src/nvim/eval/encode.h

@@ -51,6 +51,4 @@ extern const char *const encode_special_var_names[];
 /// First character that needs to be encoded as surrogate pair
 #define SURROGATE_FIRST_CHAR 0x10000
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/encode.h.generated.h"
-#endif
+#include "eval/encode.h.generated.h"

src/nvim/eval/executor.c

@@ -13,9 +13,7 @@
 #include "nvim/types_defs.h"
 #include "nvim/vim_defs.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/executor.c.generated.h"
-#endif
+#include "eval/executor.c.generated.h"
 
 char *e_list_index_out_of_range_nr
   = N_("E684: List index out of range: %" PRId64);

src/nvim/eval/executor.h

@@ -4,6 +4,4 @@
 
 extern char *e_list_index_out_of_range_nr;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/executor.h.generated.h"
-#endif
+#include "eval/executor.h.generated.h"

src/nvim/eval/fs.c

@@ -45,9 +45,7 @@
 #include "nvim/vim_defs.h"
 #include "nvim/window.h"
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/fs.c.generated.h"
-#endif
+#include "eval/fs.c.generated.h"
 
 static const char e_error_while_writing_str[] = N_("E80: Error while writing: %s");
 

src/nvim/eval/fs.h

@@ -3,6 +3,4 @@
 #include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/types_defs.h"  // IWYU pragma: keep
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/fs.h.generated.h"
-#endif
+#include "eval/fs.h.generated.h"

src/nvim/eval/funcs.c

@@ -141,23 +141,21 @@ typedef enum {
   kSomeMatchStrPos,  ///< Data for matchstrpos().
 } SomeMatchType;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/funcs.c.generated.h"
+#include "eval/funcs.c.generated.h"
 
-# ifdef _MSC_VER
+#ifdef _MSC_VER
 // This prevents MSVC from replacing the functions with intrinsics,
 // and causing errors when trying to get their addresses in funcs.generated.h
-#  pragma function(ceil)
-#  pragma function(floor)
-# endif
+# pragma function(ceil)
+# pragma function(floor)
+#endif
 
 PRAGMA_DIAG_PUSH_IGNORE_MISSING_PROTOTYPES
 PRAGMA_DIAG_PUSH_IGNORE_IMPLICIT_FALLTHROUGH
-# include "funcs.generated.h"
+#include "funcs.generated.h"
 
 PRAGMA_DIAG_POP
 PRAGMA_DIAG_POP
-#endif
 
 static const char *e_listblobarg = N_("E899: Argument of %s must be a List or Blob");
 static const char *e_invalwindow = N_("E957: Invalid window number");

src/nvim/eval/funcs.h

@@ -28,6 +28,4 @@ typedef struct {
   EvalFuncData data;  ///< Userdata for function implementation.
 } EvalFuncDef;
 
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/funcs.h.generated.h"
-#endif
+#include "eval/funcs.h.generated.h"