diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-09 04:05:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 04:05:07 +0200 |
| commit | 699e8406b5d57e1ca975af443329d8f24ae1b704 (patch) | |
| tree | 5eb97eb63e62ebd07fec7ddeffd79dc57f80d1ef /src | |
| parent | cc8f640fb16a4a697e2ad380b9973048d5142a33 (diff) | |
| parent | 8e519a22ddcad6a38d966a7c340c9fd77d72f392 (diff) | |
| download | rneovim-699e8406b5d57e1ca975af443329d8f24ae1b704.tar.gz rneovim-699e8406b5d57e1ca975af443329d8f24ae1b704.tar.bz2 rneovim-699e8406b5d57e1ca975af443329d8f24ae1b704.zip | |
Merge #6439 from ZyX-I/fix-gc-failures
unittests: Force GC, fix GC failures in typval_spec
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/iconv.h | 4 | ||||
| -rw-r--r-- | src/nvim/vim.h | 17 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/nvim/iconv.h b/src/nvim/iconv.h index bf29b15247..d7234090c4 100644 --- a/src/nvim/iconv.h +++ b/src/nvim/iconv.h @@ -10,9 +10,7 @@ // USE_ICONV, or to put the USE_ICONV definition in config.h.in directly. As // it stands, globals.h needs to be included alongside iconv.h. -#ifdef HAVE_CONFIG_H -# include "auto/config.h" -#endif +#include "auto/config.h" // Use iconv() when it's available, either by linking to the library at // compile time or by loading it at runtime. diff --git a/src/nvim/vim.h b/src/nvim/vim.h index cc0587fb88..172e62b039 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -11,20 +11,16 @@ #define RUNTIME_DIRNAME "runtime" /* end */ -/* ============ the header file puzzle (ca. 50-100 pieces) ========= */ - -#ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */ -# include "auto/config.h" -# define HAVE_PATHDEF +#include "auto/config.h" +#define HAVE_PATHDEF /* * Check if configure correctly managed to find sizeof(int). If this failed, * it becomes zero. This is likely a problem of not being able to run the * test program. Other items from configure may also be wrong then! */ -# if (SIZEOF_INT == 0) -Error: configure did not run properly.Check auto/config.log. -# endif +#if (SIZEOF_INT == 0) +# error Configure did not run properly. #endif #include "nvim/os/os_defs.h" /* bring lots of system header files */ @@ -46,11 +42,6 @@ enum { NUMBUFLEN = 65 }; #include "nvim/keymap.h" #include "nvim/macros.h" - - - -/* ================ end of the header file puzzle =============== */ - #include "nvim/gettext.h" /* special attribute addition: Put message in history */ |