aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-08 21:31:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-08 21:31:23 +0000
commita8e1070d9d888ac09a26d0f71a69ea6584d109d6 (patch)
treec1f4ff334a3c83d490eb99c9dee344f59a50fdd3
parentb3935f179b3a5668320eab59a07e4de7b747546d (diff)
downloadruby-a8e1070d9d888ac09a26d0f71a69ea6584d109d6.tar.gz
* include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
non-gcc build environments introduced at r54952. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c2434793f..1e434c7e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 9 06:30:12 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
+ non-gcc build environments introduced at r54952.
+
Mon May 9 02:51:51 2016 NARUSE, Yui <naruse@ruby-lang.org>
* gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 0283d7b721..c83c83406b 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -36,6 +36,12 @@ extern "C" {
#include "defines.h"
#define NORETURN_STYLE_NEW 1
+#ifndef CONSTFUNC
+# define CONSTFUNC(x) x
+#endif
+#ifndef PUREFUNC
+# define PUREFUNC(x) x
+#endif
#ifndef NORETURN
# define NORETURN(x) x
#endif