diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:58:46 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2021-04-04 22:58:46 +0000 |
| commit | 1bce19a7e573d94e99fb28601c483383b9ef56a4 (patch) | |
| tree | e66bfc4510345755093371031c9cf9450170abbc /version.h | |
| parent | ae1573ac739cc075cd5823c6ac512449ca5707d4 (diff) | |
merge revision(s) a0bc3f2a1c2c98f225612101cb4e1ea1a6813546,75a0447c15a7ab017bd4240c2a9cc69b134b80b9,f1699314147bad2cf5550cc582693424fdbc2510: [Backport #16846]
Suppress C4267 "possible loss of data" warnings
---
ext/win32ole/win32ole.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Suppress C4267 "possible loss of data" warnings
Just cast down explicitly.
---
ext/win32ole/win32ole.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
---
ext/win32ole/win32ole.c | 1 +
ext/win32ole/win32ole.h | 4 ++--
ext/win32ole/win32ole_error.c | 3 +++
ext/win32ole/win32ole_error.h | 4 ++--
ext/win32ole/win32ole_method.c | 2 ++
ext/win32ole/win32ole_method.h | 2 +-
ext/win32ole/win32ole_record.c | 2 ++
ext/win32ole/win32ole_record.h | 2 +-
ext/win32ole/win32ole_type.c | 2 ++
ext/win32ole/win32ole_type.h | 2 +-
ext/win32ole/win32ole_typelib.c | 2 ++
ext/win32ole/win32ole_typelib.h | 2 +-
ext/win32ole/win32ole_variable.c | 2 ++
ext/win32ole/win32ole_variable.h | 2 +-
ext/win32ole/win32ole_variant.c | 2 ++
ext/win32ole/win32ole_variant.h | 2 +-
ext/win32ole/win32ole_variant_m.c | 2 ++
ext/win32ole/win32ole_variant_m.h | 2 +-
18 files changed, 29 insertions(+), 11 deletions(-)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-04-05" -#define RUBY_PATCHLEVEL 178 +#define RUBY_PATCHLEVEL 179 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 4 |