diff --git a/ChangeLog b/ChangeLog
index 4871cead56..4416351765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Apr 22 16:24:27 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* string.c (rb_enc_cr_str_buf_cat): do not use C++ comments.
+
+Tue Apr 22 16:23:53 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* configure.in: use AC_USE_SYSTEM_EXTENSIONS.
+
+Tue Apr 22 16:23:16 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* vm_evalbody.c (DECL_SC_REG): use __asm__ instead.
+
 Tue Apr 22 16:18:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_evalbody.c (DECL_SC_REG): typo fixed.
diff --git a/vm_evalbody.c b/vm_evalbody.c
index 06164a414b..5810b94732 100644
--- a/vm_evalbody.c
+++ b/vm_evalbody.c
@@ -15,10 +15,10 @@
 #define DECL_SC_REG(type, r, reg) register type reg_##r
 
 #elif __GNUC__ && __x86_64__
-#define DECL_SC_REG(type, r, reg) register type reg_##r asm("r" reg)
+#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
 
 #elif __GNUC__ && __i386__
-#define DECL_SC_REG(type, r, reg) register type reg_##r asm("e" reg)
+#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("e" reg)
 
 #else
 #define DECL_SC_REG(type, r, reg) register type reg_##r