diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-08 18:23:02 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-09 03:36:18 +0300 |
| commit | 0f4b4c7529d6699bcae5c943a4bc27827c9aa8d6 (patch) | |
| tree | 5b0984db42ef35c0fd22f7b9051e1b7b5df461ae | |
| parent | 8990490b50df651144658d0e68c7f582d7013376 (diff) | |
| download | rneovim-0f4b4c7529d6699bcae5c943a4bc27827c9aa8d6.tar.gz rneovim-0f4b4c7529d6699bcae5c943a4bc27827c9aa8d6.tar.bz2 rneovim-0f4b4c7529d6699bcae5c943a4bc27827c9aa8d6.zip | |
headers: Remove useless HAVE_CONFIG_H macros
We do not have non-cmake build options, cmake always does configure_file.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/nvim/iconv.h | 4 | ||||
| -rw-r--r-- | src/nvim/vim.h | 10 |
3 files changed, 5 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e8956c9074..2232543cc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,7 +275,6 @@ else() endif() add_definitions(-DINCLUDE_GENERATED_DECLARATIONS) -add_definitions(-DHAVE_CONFIG_H) if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined") 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..d92115ecdf 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -13,18 +13,16 @@ /* ============ 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 */ |