aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/api/private/helpers.h
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-10-30 23:44:36 -0400
committerJames McCoy <jamessan@jamessan.com>2016-11-02 10:06:27 -0400
commit37e64d79cc12ceded903a490c0d6edaa60950fc6 (patch)
treefefbc3a0cffa98fd4fafe7f149b919d08b84cbda /src/nvim/api/private/helpers.h
parent87ff2682d7856c508311eeab5bd65c2505fc61d3 (diff)
downloadrneovim-37e64d79cc12ceded903a490c0d6edaa60950fc6.tar.gz
rneovim-37e64d79cc12ceded903a490c0d6edaa60950fc6.tar.bz2
rneovim-37e64d79cc12ceded903a490c0d6edaa60950fc6.zip
object_to_vim: Fix buffer/window/tabpage conversion on BE systems
Since data.integer is a different (larger) integer type than data.{buffer,window,tabpage}, we cannot abuse the union by using data.integer to access the value for all 4 types. Instead, remove the {buffer,window,tabpage} members and always use the integer member. In order to accomodate this, perform distinct validation and coercion between the Integer type and Buffer/Window/Tabpage types in object_to_vim, msgpack_rpc helpers, and gendispatch.lua.
Diffstat (limited to 'src/nvim/api/private/helpers.h')
-rw-r--r--src/nvim/api/private/helpers.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index a946e35149..9fe8c351cf 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -37,15 +37,15 @@
#define BUFFER_OBJ(s) ((Object) { \
.type = kObjectTypeBuffer, \
- .data.buffer = s })
+ .data.integer = s })
#define WINDOW_OBJ(s) ((Object) { \
.type = kObjectTypeWindow, \
- .data.window = s })
+ .data.integer = s })
#define TABPAGE_OBJ(s) ((Object) { \
.type = kObjectTypeTabpage, \
- .data.tabpage = s })
+ .data.integer = s })
#define ARRAY_OBJ(a) ((Object) { \
.type = kObjectTypeArray, \