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_3@54899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c346a35e4..8eebe1fb6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed May  4 02:38:08 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Wed May  4 02:38:08 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
 Tue Apr 26 23:34:45 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
 	* version.h: Bump versionto 2.3.2.
diff --git a/complex.c b/complex.c
index ec52beaf0a..5199dcc7c2 100644
--- a/complex.c
+++ b/complex.c
@@ -1414,7 +1414,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 ea088e1a47..7602559e2c 100644
--- a/internal.h
+++ b/internal.h
@@ -407,7 +407,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 287a1fc3ef..91ca3c7687 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 113
+#define RUBY_RELEASE_DATE "2016-05-04"
+#define RUBY_PATCHLEVEL 114
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"