https://git.ruby-lang.org/ruby.git/commit/?id=b829811131

From b829811131ec7741ce701ff8a8b101604fb0d595 Mon Sep 17 00:00:00 2001
From: NAKAMURA Usaku <usa@r...>
Date: Fri, 31 Dec 2021 19:48:13 +0900
Subject: merge revision(s) 43a3c88187dcd54ba008834a865e50eb28a78de9: [Backport
 #18372]

	[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(+)
---
 version.h          | 2 +-
 win32/Makefile.sub | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/version.h b/version.h
index 2b7d4f8f910..1e9078f3aca 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 6
 #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_MONTH 12
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0bc5efbfb2e..858d14758b7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -635,7 +635,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L635
 #define SIZEOF_LONG_LONG 0
 !endif
 #define SIZEOF___INT64 8
+#ifndef _INTEGRAL_MAX_BITS
 #define _INTEGRAL_MAX_BITS 64
+#endif
 !if $(LARGEFILE_SUPPORT)
 #define SIZEOF_OFF_T 8
 !else
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/