merge revision(s) 54896,54897: [Backport #12343]

	* complex.c (rb_complex_set_imag): Fix to properly set imag
	  of complex.

	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
	  instead of duplicated undef RCOMPLEX_SET_REAL.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 095a223360..229f8612d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
 Fri Jun 10 15:05:41 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
diff --git a/complex.c b/complex.c
index 11a394c6ce..4548c5e2a5 100644
--- a/complex.c
+++ b/complex.c
@@ -1351,7 +1351,7 @@ rb_complex_set_real(VALUE cmp, VALUE r)
 VALUE
 rb_complex_set_imag(VALUE cmp, VALUE i)
 {
-    RCOMPLEX_SET_REAL(cmp, i);
+    RCOMPLEX_SET_IMAG(cmp, i);
     return cmp;
 }
 
diff --git a/internal.h b/internal.h
index d512514b3a..ee55db3cb4 100644
--- a/internal.h
+++ b/internal.h
@@ -453,7 +453,7 @@ struct RComplex {
 
 #ifdef RCOMPLEX_SET_REAL        /* shortcut macro for internal only */
 #undef RCOMPLEX_SET_REAL
-#undef RCOMPLEX_SET_REAL
+#undef RCOMPLEX_SET_IMAG
 #define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r))
 #define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i))
 #endif
diff --git a/version.h b/version.h
index fd53d00b2a..7e28ff016f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-06-10"
-#define RUBY_PATCHLEVEL 323
+#define RUBY_PATCHLEVEL 324
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 6