2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 778330bd82..97077445ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  3 23:14:16 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* gc.c (ATOMIC_SIZE_EXCHANGE): fix function name on Solaris [Bug #6689]
+	  [ruby-dev:45904]
+
 Tue Jul  3 16:07:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (vm_malloc_fixup, vm_xrealloc, vm_xfree, after_gc_sweep): use
diff --git a/gc.c b/gc.c
index 3487cba2cf..82e250bdb6 100644
--- a/gc.c
+++ b/gc.c
@@ -79,7 +79,7 @@
 # define ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val))
 # define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var))
 # define ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var))
-# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_long(&(var), (val))
+# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val))
 # else
 # define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
 # define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))