Skip to content
  • U.Nakamura's avatar
    1bce19a7
    merge revision(s)... · 1bce19a7
    U.Nakamura authored
    merge revision(s) a0bc3f2a,75a0447c,f1699314: [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
    1bce19a7
    merge revision(s)...
    U.Nakamura authored
    merge revision(s) a0bc3f2a,75a0447c,f1699314: [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
Loading