IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use platform check for correct selection of khash type in helpers.c

Browse Source
This commit is contained in:
Thiago de Arruda 2014-05-12 21:44:33 -03:00
parent f69b0a1dc7
commit f0f4ab5500
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/CMakeLists.txt
View File

@ -5,6 +5,7 @@ check_type_size("int" SIZEOF_INT)
check_type_size("long" SIZEOF_LONG) check_type_size("long" SIZEOF_LONG)
check_type_size("time_t" SIZEOF_TIME_T) check_type_size("time_t" SIZEOF_TIME_T)
check_type_size("off_t" SIZEOF_OFF_T) check_type_size("off_t" SIZEOF_OFF_T)
check_type_size("void *" SIZEOF_VOID_PTR)
check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON) check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)

6
config/config.h.in
View File

@ -11,6 +11,12 @@
#define SIZEOF_TIME_T @SIZEOF_TIME_T@ #define SIZEOF_TIME_T @SIZEOF_TIME_T@
#define SIZEOF_OFF_T @SIZEOF_OFF_T@ #define SIZEOF_OFF_T @SIZEOF_OFF_T@
#if @SIZEOF_VOID_PTR@ == 8
#define ARCH_64
#elif @SIZEOF_VOID_PTR@ == 4
#define ARCH_32
#endif
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#cmakedefine HAVE__NSGETENVIRON #cmakedefine HAVE__NSGETENVIRON
#cmakedefine HAVE_CRT_EXTERNS_H #cmakedefine HAVE_CRT_EXTERNS_H

8
src/api/helpers.c
View File

@ -14,7 +14,13 @@
#include "lib/khash.h" #include "lib/khash.h"
#if defined(ARCH_64)
typedef uint64_t ptr_int_t;
KHASH_SET_INIT_INT64(Lookup) KHASH_SET_INIT_INT64(Lookup)
#elif defined(ARCH_32)
typedef uint32_t ptr_int_t;
KHASH_SET_INIT_INT(Lookup)
#endif
/// Recursion helper for the `vim_to_object`. This uses a pointer table /// Recursion helper for the `vim_to_object`. This uses a pointer table
/// to avoid infinite recursion due to cyclic references /// to avoid infinite recursion due to cyclic references
@ -406,7 +412,7 @@ static Object vim_to_object_rec(typval_T *obj, khash_t(Lookup) *lookup)
if (obj->v_type == VAR_LIST || obj->v_type == VAR_DICT) { if (obj->v_type == VAR_LIST || obj->v_type == VAR_DICT) {
int ret; int ret;
// Container object, add it to the lookup table // Container object, add it to the lookup table
kh_put(Lookup, lookup, (uint64_t)obj, &ret); kh_put(Lookup, lookup, (ptr_int_t)obj, &ret);
if (!ret) { if (!ret) {
// It's already present, meaning we alredy processed it so just return // It's already present, meaning we alredy processed it so just return
// nil instead. // nil instead.