add creal/cimag macros in complex.h (and use them in the functions defs)

diff --git a/include/complex.h b/include/complex.h
index 8ee7057..90496bd 100644 (file)
--- a/include/complex.h
+++ b/include/complex.h
@@ -97,6 +97,17 @@ double creal(double complex);
 float crealf(float complex);
 long double creall(long 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])
+
+#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) __CREALIMAG(x, double, 1)
+#define cimagf(x) __CREALIMAG(x, float, 1)
+#define cimagl(x) __CREALIMAG(x, long double, 1)
+

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/complex/cimag.c b/src/complex/cimag.c
index 5e1ad46..0095564 100644 (file)
--- a/src/complex/cimag.c
+++ b/src/complex/cimag.c
@@ -2,6 +2,5 @@
 
 double (cimag)(double complex z)
 {
 
 double (cimag)(double complex z)
 {

-       union dcomplex u = {z};
-       return u.a[1];
+       return cimag(z);

 }
 }

diff --git a/src/complex/cimagf.c b/src/complex/cimagf.c
index 99fffc5..f7bcd76 100644 (file)
--- a/src/complex/cimagf.c
+++ b/src/complex/cimagf.c
@@ -2,6 +2,5 @@
 
 float (cimagf)(float complex z)
 {
 
 float (cimagf)(float complex z)
 {

-       union fcomplex u = {z};
-       return u.a[1];
+       return cimagf(z);

 }
 }

diff --git a/src/complex/cimagl.c b/src/complex/cimagl.c
index d9a0780..9ec24ee 100644 (file)
--- a/src/complex/cimagl.c
+++ b/src/complex/cimagl.c
@@ -2,6 +2,5 @@
 
 long double (cimagl)(long double complex z)
 {
 
 long double (cimagl)(long double complex z)
 {

-       union lcomplex u = {z};
-       return u.a[1];
+       return cimagl(z);

 }
 }

diff --git a/src/complex/creal.c b/src/complex/creal.c
index 2bb9181..f670304 100644 (file)
--- a/src/complex/creal.c
+++ b/src/complex/creal.c
@@ -1,6 +1,6 @@
 #include <complex.h>
 
 #include <complex.h>
 

-double creal(double complex z)
+double (creal)(double complex z)

 {
 {

-       return z;
+       return creal(z);

 }
 }

diff --git a/src/complex/crealf.c b/src/complex/crealf.c
index 078232f..5dc3ff1 100644 (file)
--- a/src/complex/crealf.c
+++ b/src/complex/crealf.c
@@ -1,6 +1,6 @@
 #include <complex.h>
 
 #include <complex.h>
 

-float crealf(float complex z)
+float (crealf)(float complex z)

 {
 {

-       return z;
+       return crealf(z);

 }
 }

diff --git a/src/complex/creall.c b/src/complex/creall.c
index 56e6409..fd9dc34 100644 (file)
--- a/src/complex/creall.c
+++ b/src/complex/creall.c
@@ -1,6 +1,6 @@
 #include <complex.h>
 
 #include <complex.h>
 

-long double creall(long double complex z)
+long double (creall)(long double complex z)

 {
 {

-       return z;
+       return creall(z);

 }
 }

diff --git a/src/internal/libm.h b/src/internal/libm.h
index 67c42b9..8c5474a 100644 (file)
--- a/src/internal/libm.h
+++ b/src/internal/libm.h
@@ -173,14 +173,6 @@ union lcomplex {
        long double a[2];
 };
 
        long double a[2];
 };
 

-// FIXME: move to complex.h ?
-#define creal(z) ((double)(z))
-#define crealf(z) ((float)(z))
-#define creall(z) ((long double)(z))
-#define cimag(z) ((union dcomplex){(z)}.a[1])
-#define cimagf(z) ((union fcomplex){(z)}.a[1])
-#define cimagl(z) ((union lcomplex){(z)}.a[1])
-

 /* x + y*I is not supported properly by gcc */
 #define cpack(x,y) ((union dcomplex){.a={(x),(y)}}.z)
 #define cpackf(x,y) ((union fcomplex){.a={(x),(y)}}.z)
 /* x + y*I is not supported properly by gcc */
 #define cpack(x,y) ((union dcomplex){.a={(x),(y)}}.z)
 #define cpackf(x,y) ((union fcomplex){.a={(x),(y)}}.z)