X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fcomplex.h;h=008b3c7e3b7d6190cb864892aa7b2bad3f1aa2cf;hb=0a7b4323b0f2b944dbd47a813c0c6e6813e7fd67;hp=90496bd5d397737ecc1f6f87d416a8371e49225c;hpb=13e400b3559666b5e584bdf6f8450aad826b43ae;p=musl

diff --git a/include/complex.h b/include/complex.h
index 90496bd5..008b3c7e 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -6,7 +6,11 @@ extern "C" {
 #endif
 
 #define complex _Complex
-#define _Complex_I 1.0fi
+#ifdef __GNUC__
+#define _Complex_I (__extension__ (0.0f+1.0fi))
+#else
+#define _Complex_I (0.0f+1.0fi)
+#endif
 #define I _Complex_I
 
 double complex cacos(double complex);
@@ -97,16 +101,31 @@ double creal(double complex);
 float crealf(float complex);
 long double creall(long double complex);
 
-#define __CREALIMAG(x, t, i) \
-	((union { _Complex t __z; t __xy[2]; }){(_Complex t)(x)}.__xy[i])
+#ifndef __cplusplus
+#define __CIMAG(x, t) \
+	(+(union { _Complex t __z; t __xy[2]; }){(_Complex t)(x)}.__xy[1])
+
+#define creal(x) ((double)(x))
+#define crealf(x) ((float)(x))
+#define creall(x) ((long double)(x))
 
-#define creal(x) __CREALIMAG(x, double, 0)
-#define crealf(x) __CREALIMAG(x, float, 0)
-#define creall(x) __CREALIMAG(x, long double, 0)
+#define cimag(x) __CIMAG(x, double)
+#define cimagf(x) __CIMAG(x, float)
+#define cimagl(x) __CIMAG(x, long double)
+#endif
 
-#define cimag(x) __CREALIMAG(x, double, 1)
-#define cimagf(x) __CREALIMAG(x, float, 1)
-#define cimagl(x) __CREALIMAG(x, long double, 1)
+#if __STDC_VERSION__ >= 201112L
+#if defined(_Imaginary_I)
+#define __CMPLX(x, y, t) ((t)(x) + _Imaginary_I*(t)(y))
+#elif defined(__clang__)
+#define __CMPLX(x, y, t) (+(_Complex t){ (t)(x), (t)(y) })
+#else
+#define __CMPLX(x, y, t) (__builtin_complex((t)(x), (t)(y)))
+#endif
+#define CMPLX(x, y) __CMPLX(x, y, double)
+#define CMPLXF(x, y) __CMPLX(x, y, float)
+#define CMPLXL(x, y) __CMPLX(x, y, long double)
+#endif
 
 #ifdef __cplusplus
 }