[前][次][番号順一覧][スレッド一覧]

ruby-changes:60299

From: Nobuyoshi <ko1@a...>
Date: Thu, 5 Mar 2020 12:04:00 +0900 (JST)
Subject: [ruby-changes:60299] 43a3c88187 (master): [win32] get rid of redefinition of reserved macro

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

From 43a3c88187dcd54ba008834a865e50eb28a78de9 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 5 Mar 2020 12:00:50 +0900
Subject: [win32] get rid of redefinition of reserved macro

```
warning C4117: macro name '_INTEGRAL_MAX_BITS' is reserved, '#define' ignored
```

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index bd350dc..6d91bbc 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 v0.10.2


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

[前][次][番号順一覧][スレッド一覧]