summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-16 10:47:54 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-16 10:47:54 +0000
commita334693422650c58d08c6098ca3ea0760713a314 (patch)
tree765a90c081b5e568650ab6906711d9beba7b7a4c
parent2fc5210f31ad23463d7b0a0e36bcfbeee7b41b3e (diff)
* win32/Makefile.sub (config.h): fixed compile error with VC introduced
by previous commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8eeefbd34e..601d1ffb32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 16 19:46:05 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): fixed compile error with VC introduced
+ by previous commit.
+
Fri Sep 16 14:54:34 2016 URABE Shyouhei <shyouhei@ruby-lang.org>
* internal.h (WARN_UNUSED_RESULT): moved to configure.in, to
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e3fae91c65..dc198f63d2 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -604,6 +604,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define NOINLINE(x) __declspec(noinline) x
!endif
#define ALWAYS_INLINE(x) __forceinline x
+#define WARN_UNUSED_RESULT(x) x
+#define MAYBE_UNUSED(x) x
#define UNREACHABLE __assume(0)
#define ASSUME(x) __assume(!!(x))
#define FUNC_STDCALL(x) __stdcall x