complex: add C11 CMPLX macros and replace cpack with them

[musl] / src / complex / csinhf.c

diff --git a/src/complex/csinhf.c b/src/complex/csinhf.c
index bbb116c..49697f0 100644 (file)
--- a/src/complex/csinhf.c
+++ b/src/complex/csinhf.c
@@ -48,43 +48,43 @@ float complex csinhf(float complex z)
 
        if (ix < 0x7f800000 && iy < 0x7f800000) {
                if (iy == 0)
-                       return cpackf(sinhf(x), y);
+                       return CMPLXF(sinhf(x), y);
                if (ix < 0x41100000)    /* small x: normal case */
-                       return cpackf(sinhf(x) * cosf(y), coshf(x) * sinf(y));
+                       return CMPLXF(sinhf(x) * cosf(y), coshf(x) * sinf(y));
 
                /* |x| >= 9, so cosh(x) ~= exp(|x|) */
                if (ix < 0x42b17218) {
                        /* x < 88.7: expf(|x|) won't overflow */
                        h = expf(fabsf(x)) * 0.5f;
-                       return cpackf(copysignf(h, x) * cosf(y), h * sinf(y));
+                       return CMPLXF(copysignf(h, x) * cosf(y), h * sinf(y));
                } else if (ix < 0x4340b1e7) {
                        /* x < 192.7: scale to avoid overflow */
-                       z = __ldexp_cexpf(cpackf(fabsf(x), y), -1);
-                       return cpackf(crealf(z) * copysignf(1, x), cimagf(z));
+                       z = __ldexp_cexpf(CMPLXF(fabsf(x), y), -1);
+                       return CMPLXF(crealf(z) * copysignf(1, x), cimagf(z));
                } else {
                        /* x >= 192.7: the result always overflows */
                        h = huge * x;
-                       return cpackf(h * cosf(y), h * h * sinf(y));
+                       return CMPLXF(h * cosf(y), h * h * sinf(y));
                }
        }
 
        if (ix == 0 && iy >= 0x7f800000)
-               return cpackf(copysignf(0, x * (y - y)), y - y);
+               return CMPLXF(copysignf(0, x * (y - y)), y - y);
 
        if (iy == 0 && ix >= 0x7f800000) {
                if ((hx & 0x7fffff) == 0)
-                       return cpackf(x, y);
-               return cpackf(x, copysignf(0, y));
+                       return CMPLXF(x, y);
+               return CMPLXF(x, copysignf(0, y));
        }
 
        if (ix < 0x7f800000 && iy >= 0x7f800000)
-               return cpackf(y - y, x * (y - y));
+               return CMPLXF(y - y, x * (y - y));
 
        if (ix >= 0x7f800000 && (hx & 0x7fffff) == 0) {
                if (iy >= 0x7f800000)
-                       return cpackf(x * x, x * (y - y));
-               return cpackf(x * cosf(y), INFINITY * sinf(y));
+                       return CMPLXF(x * x, x * (y - y));
+               return CMPLXF(x * cosf(y), INFINITY * sinf(y));
        }
 
-       return cpackf((x * x) * (y - y), (x + x) * (y - y));
+       return CMPLXF((x * x) * (y - y), (x + x) * (y - y));
 }