From acc646ad8fc3ef11fcc63b69f3d8484e4a91accd Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 29 Sep 2023 14:58:48 +0200 Subject: refactor: the long goodbye long is 32 bits on windows, while it is 64 bits on other architectures. This makes the type suboptimal for a codebase meant to be cross-platform. Replace it with more appropriate integer types. --- src/nvim/shada.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/nvim/shada.c') diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 6a398c167d..0729368b9c 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2503,9 +2503,9 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, ShaDaReadDef // Initialize history merger for (HistoryType i = 0; i < HIST_COUNT; i++) { - long num_saved = get_shada_parameter(hist_type2char(i)); + int num_saved = get_shada_parameter(hist_type2char(i)); if (num_saved == -1) { - num_saved = (long)p_hi; + num_saved = (int)p_hi; } if (num_saved > 0) { dump_history = true; @@ -3338,7 +3338,6 @@ static ShaDaReadResult msgpack_read_uint64(ShaDaReadDef *const sd_reader, const #define ID(s) s #define BINDUP(b) xmemdupz((b).ptr, (b).size) #define TOINT(s) ((int)(s)) -#define TOLONG(s) ((long)(s)) #define TOCHAR(s) ((char)(s)) #define TOU8(s) ((uint8_t)(s)) #define TOSIZE(s) ((size_t)(s)) @@ -3964,7 +3963,6 @@ shada_read_next_item_error: #undef BINDUP #undef TOCHAR #undef TOINT -#undef TOLONG #undef TYPED_KEY #undef INT_KEY #undef INTEGER_KEY -- cgit