diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-02-27 19:46:39 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2023-03-03 14:26:10 +0100 |
| commit | c9b6db45417ecbd178f0c6106f4033c760cc75df (patch) | |
| tree | c3845f79cc8857c481460ee02cecd4beb35d93de | |
| parent | c002fd421e3d8deb4adf144cadcd3a6fe4635e12 (diff) | |
| download | rneovim-c9b6db45417ecbd178f0c6106f4033c760cc75df.tar.gz rneovim-c9b6db45417ecbd178f0c6106f4033c760cc75df.tar.bz2 rneovim-c9b6db45417ecbd178f0c6106f4033c760cc75df.zip | |
refactor(build): graduate msgpack-c FLOAT32 "feature" since forever
| -rw-r--r-- | cmake/FindMsgpack.cmake | 15 | ||||
| -rw-r--r-- | src/nvim/eval/decode.c | 4 | ||||
| -rw-r--r-- | src/nvim/msgpack_rpc/helpers.c | 8 |
3 files changed, 0 insertions, 27 deletions
diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake index 43c4c3c16b..b1888560c3 100644 --- a/cmake/FindMsgpack.cmake +++ b/cmake/FindMsgpack.cmake @@ -29,18 +29,3 @@ find_package_handle_standard_args(Msgpack add_library(msgpack INTERFACE) target_include_directories(msgpack SYSTEM BEFORE INTERFACE ${MSGPACK_INCLUDE_DIR}) target_link_libraries(msgpack INTERFACE ${MSGPACK_LIBRARY}) - -list(APPEND CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIR}") -check_c_source_compiles(" -#include <msgpack.h> - -int -main(void) -{ - return MSGPACK_OBJECT_FLOAT32; -} -" MSGPACK_HAS_FLOAT32) -list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIR}") -if(MSGPACK_HAS_FLOAT32) - target_compile_definitions(msgpack INTERFACE NVIM_MSGPACK_HAS_FLOAT32) -endif() diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c index cd1479f150..f57d06c83b 100644 --- a/src/nvim/eval/decode.c +++ b/src/nvim/eval/decode.c @@ -987,12 +987,8 @@ int msgpack_to_vim(const msgpack_object mobj, typval_T *const rettv) tv_list_append_number(list, (varnumber_T)(n & 0x7FFFFFFF)); } break; -#ifdef NVIM_MSGPACK_HAS_FLOAT32 case MSGPACK_OBJECT_FLOAT32: case MSGPACK_OBJECT_FLOAT64: -#else - case MSGPACK_OBJECT_FLOAT: -#endif *rettv = (typval_T) { .v_type = VAR_FLOAT, .v_lock = VAR_UNLOCKED, diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c index 5f0f03dd69..d1fd28f882 100644 --- a/src/nvim/msgpack_rpc/helpers.c +++ b/src/nvim/msgpack_rpc/helpers.c @@ -84,12 +84,8 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg) *cur.aobj = INTEGER_OBJ((Integer)cur.mobj->via.u64); } break; -#ifdef NVIM_MSGPACK_HAS_FLOAT32 case MSGPACK_OBJECT_FLOAT32: case MSGPACK_OBJECT_FLOAT64: -#else - case MSGPACK_OBJECT_FLOAT: -#endif { STATIC_ASSERT(sizeof(Float) == sizeof(cur.mobj->via.f64), "Msgpack floating-point size does not match API integer"); @@ -156,12 +152,8 @@ bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg) case MSGPACK_OBJECT_BOOLEAN: case MSGPACK_OBJECT_POSITIVE_INTEGER: case MSGPACK_OBJECT_NEGATIVE_INTEGER: -#ifdef NVIM_MSGPACK_HAS_FLOAT32 case MSGPACK_OBJECT_FLOAT32: case MSGPACK_OBJECT_FLOAT64: -#else - case MSGPACK_OBJECT_FLOAT: -#endif case MSGPACK_OBJECT_EXT: case MSGPACK_OBJECT_MAP: case MSGPACK_OBJECT_ARRAY: |