diff options
| -rw-r--r-- | test/includes/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/includes/pre/uv.h (renamed from test/includes/pre/uv-errno.h) | 2 | ||||
| -rw-r--r-- | test/unit/os/fs_spec.lua | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/test/includes/CMakeLists.txt b/test/includes/CMakeLists.txt index 2846df0e37..4d7e962fbd 100644 --- a/test/includes/CMakeLists.txt +++ b/test/includes/CMakeLists.txt @@ -7,6 +7,13 @@ foreach(gen_include ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}) list(APPEND gen_cflags ${CMAKE_INCLUDE_FLAG_C}${gen_include}) endforeach() +get_directory_property(gen_cdefs COMPILE_DEFINITIONS) +foreach(gen_cdef ${gen_cdefs}) + if(NOT ${gen_cdef} MATCHES "INCLUDE_GENERATED_DECLARATIONS") + list(APPEND gen_cflags "-D${gen_cdef}") + endif() +endforeach() + foreach(hfile ${PRE_HEADERS}) string(REGEX REPLACE ^pre/ post/ post_hfile ${hfile}) get_filename_component(hdir ${CMAKE_CURRENT_BINARY_DIR}/${post_hfile} PATH) diff --git a/test/includes/pre/uv-errno.h b/test/includes/pre/uv.h index 6b80f60e5c..da7818cd07 100644 --- a/test/includes/pre/uv-errno.h +++ b/test/includes/pre/uv.h @@ -1,4 +1,4 @@ -#include <uv-errno.h> +#include <uv.h> static const int kUV_ENOENT = UV_ENOENT; static const int kUV_EEXIST = UV_EEXIST; diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua index ae6dfe6423..ddb438eb3d 100644 --- a/test/unit/os/fs_spec.lua +++ b/test/unit/os/fs_spec.lua @@ -27,7 +27,7 @@ cimport('./src/nvim/fileio.h') local fs = cimport('./src/nvim/os/os.h', './src/nvim/path.h') cppimport('sys/stat.h') cppimport('fcntl.h') -cppimport('uv-errno.h') +cppimport('uv.h') local s = '' for i = 0, 255 do |