diff --git a/ChangeLog b/ChangeLog
index 8544d0170a..ec66907051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr  6 23:38:09 2013  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* addr2line.c: quad_t and u_quad_t is not available on Solaris.
+	  __inline is not available with old compilers on Solaris.
+	  [ruby-dev:47229] [Bug #8227]
+
 Sat Apr  6 23:31:38 2013  Tanaka Akira  <akr@fsij.org>
 
 	* lib/resolv.rb: Add one-shot multicast DNS support.
diff --git a/addr2line.c b/addr2line.c
index 34931238e4..ec69efd214 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -646,6 +646,19 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
     free(lines);
 }
 
+#if defined(__sun)
+/* Solaris has different quad_t and does not have u_quad_t */
+# include "ruby/defines.h"
+# define quad_t LONG_LONG
+# define u_quad_t unsigned LONG_LONG
+/* __inline can only be used with GCC or Sun Studio 12 Update 1 or later */
+# if defined(__GNUC__)
+# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+# else
+#  define __inline inline
+# endif
+#endif /* defined(__sun) */
+
 /* From FreeBSD's lib/libstand/printf.c */
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993