archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 43a3c88187: [Backport #18372]

Browse source 
[win32] get rid of redefinition of reserved macro

	```
	warning C4117: macro name '_INTEGRAL_MAX_BITS' is reserved, '#define' ignored
	```
	---
	 win32/Makefile.sub | 2 ++
	 1 file changed, 2 insertions(+)
This commit is contained in:
NAKAMURA Usaku 2021-12-31 19:48:13 +09:00
parent c24f436c2a
commit b829811131
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 6 #define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 204 #define RUBY_PATCHLEVEL 205
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12

2
win32/Makefile.sub
View file

@ -635,7 +635,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define SIZEOF_LONG_LONG 0 #define SIZEOF_LONG_LONG 0
!endif !endif
#define SIZEOF___INT64 8 #define SIZEOF___INT64 8
#ifndef _INTEGRAL_MAX_BITS
#define _INTEGRAL_MAX_BITS 64 #define _INTEGRAL_MAX_BITS 64
#endif
!if $(LARGEFILE_SUPPORT) !if $(LARGEFILE_SUPPORT)
#define SIZEOF_OFF_T 8 #define SIZEOF_OFF_T 8
!else !else