From b829811131ec7741ce701ff8a8b101604fb0d595 Mon Sep 17 00:00:00 2001
From: NAKAMURA Usaku <usa@ruby-lang.org>
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(+)
---
 win32/Makefile.sub | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0bc5efbfb2..858d14758b 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -635,7 +635,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #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.3