summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2021-12-31 19:48:13 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2021-12-31 19:48:13 +0900
commitb829811131ec7741ce701ff8a8b101604fb0d595 (patch)
tree58bdfc582551fc63767b892672cca9a5db00c5b3 /win32
parentc24f436c2a4b343f9cb4950260376546f5ff0d06 (diff)
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(+)
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub2
1 files changed, 2 insertions, 0 deletions
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