From 03b383a5754042573fbc2fcfa9f809cdeee438ae Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 10 Jun 2016 06:38:57 +0000 Subject: 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 --- internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal.h') 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 -- cgit v1.2.3