diff --git a/ChangeLog b/ChangeLog
index d379853d31..d9e133582f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 24 17:18:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback
+	  definitions.
+
 Tue May 24 16:37:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* configure.in (ruby_cflags): separate from optflags [Bug #12409]
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 49127e0106..25700165d0 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -45,6 +45,18 @@ extern "C" {
 #ifndef NOINLINE
 # define NOINLINE(x) x
 #endif
+#ifndef ERRORFUNC
+# define HAVE_ATTRIBUTE_ERRORFUNC 0
+# define ERRORFUNC(mesg, x) x
+#else
+# define HAVE_ATTRIBUTE_ERRORFUNC 1
+#endif
+#ifndef WARNINGFUNC
+# define HAVE_ATTRIBUTE_WARNINGFUNC 0
+# define WARNINGFUNC(mesg, x) x
+#else
+# define HAVE_ATTRIBUTE_WARNINGFUNC 1
+#endif
 
 #ifndef GCC_VERSION_SINCE
 #define GCC_VERSION_SINCE(major, minor, patchlevel) \