diff options
| author | nagachika <nagachika@ruby-lang.org> | 2020-07-26 16:19:40 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2020-07-26 16:19:40 +0900 |
| commit | 43cc6997c59d2fbe3b91e91ee52faaa8749e9349 (patch) | |
| tree | 58ae0dd2f415b1177ff4e626dc0be1f22d53185f /ext/win32ole/win32ole.c | |
| parent | 578bacc471fa3fa14f8607fe67adccce21e81657 (diff) | |
merge revision(s) a0bc3f2a1c2c98f225612101cb4e1ea1a6813546,75a0447c15a7ab017bd4240c2a9cc69b134b80b9,f1699314147bad2cf5550cc582693424fdbc2510: [Backport #16846]
Suppress C4267 "possible loss of data" warnings
Suppress C4267 "possible loss of data" warnings
Just cast down explicitly.
win32ole: separate global variable declarations and definitions
https://gcc.gnu.org/gcc-10/changes.html#c
> * GCC now defaults to `-fno-common`. As a result, global
> variable accesses are more efficient on various targets. In
> C, global variables with multiple tentative definitions now
> result in linker errors. With `-fcommon` such definitions are
> silently merged during linking.
Diffstat (limited to 'ext/win32ole/win32ole.c')
| -rw-r--r-- | ext/win32ole/win32ole.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index f20bfc84f6..4f4550c5b9 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -2651,7 +2651,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket) /*------------------------------------------ hash object ==> named dispatch parameters --------------------------------------------*/ - cNamedArgs = rb_long2int(RHASH_SIZE(param)); + cNamedArgs = rb_long2int((long)RHASH_SIZE(param)); op.dp.cArgs = cNamedArgs + argc - 2; op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1); op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs); @@ -3962,6 +3962,7 @@ check_nano_server(void) } } +LCID cWIN32OLE_lcid; void Init_win32ole(void) |