diff --git a/ChangeLog b/ChangeLog
index ab0afa5d22..9d00b68313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun  8 20:33:44 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/intern.h: Remove excess semicolons in PUREFUNC().
+	  Fix failure of TestMkmf::TestConvertible on Solaris with
+	  Oracle Solaris Studio 12. [ruby-dev:49651] [Bug #12470]
+	* internal.h: ditto.
+
 Wed Jun  8 16:03:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/smtp.rb (getok, get_response): raise an ArgumentError when
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 2a89ea2772..c6520d8443 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -482,7 +482,7 @@ VALUE rb_str_encode_ospath(VALUE);
 int rb_is_absolute_path(const char *);
 /* gc.c */
 NORETURN(void rb_memerror(void));
-PUREFUNC(int rb_during_gc(void););
+PUREFUNC(int rb_during_gc(void));
 void rb_gc_mark_locations(const VALUE*, const VALUE*);
 void rb_mark_tbl(struct st_table*);
 void rb_mark_set(struct st_table*);
@@ -784,7 +784,7 @@ VALUE rb_sym_to_s(VALUE);
 long rb_str_strlen(VALUE);
 VALUE rb_str_length(VALUE);
 long rb_str_offset(VALUE, long);
-PUREFUNC(size_t rb_str_capacity(VALUE););
+PUREFUNC(size_t rb_str_capacity(VALUE));
 VALUE rb_str_ellipsize(VALUE, long);
 VALUE rb_str_scrub(VALUE, VALUE);
 /* symbol.c */
diff --git a/internal.h b/internal.h
index 38c7986734..1294b8d091 100644
--- a/internal.h
+++ b/internal.h
@@ -1452,7 +1452,7 @@ VALUE rb_obj_is_thread(VALUE obj);
 void rb_vm_mark(void *ptr);
 void Init_BareVM(void);
 void Init_vm_objects(void);
-PUREFUNC(VALUE rb_vm_top_self(void););
+PUREFUNC(VALUE rb_vm_top_self(void));
 void rb_thread_recycle_stack_release(VALUE *);
 void rb_vm_change_state(void);
 void rb_vm_inc_const_missing_count(void);