make CMPLX macros available in complex.h in non-c11 mode as well

diff --git a/include/complex.h b/include/complex.h
index 8206e02..13a45c5 100644 (file)
--- a/include/complex.h
+++ b/include/complex.h
@@ -115,11 +115,9 @@ long double creall(long double complex);
 #define __CMPLX(x, y, t) \
        ((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z)
 
 #define __CMPLX(x, y, t) \
        ((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z)
 

-#if __STDC_VERSION__ >= 201112L

 #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)
 #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
 }
 
 #ifdef __cplusplus
 }

diff --git a/src/internal/libm.h b/src/internal/libm.h
index 46c4b56..64cc838 100644 (file)
--- a/src/internal/libm.h
+++ b/src/internal/libm.h
@@ -168,12 +168,4 @@ long double __p1evll(long double, const long double *, int);
 #define STRICT_ASSIGN(type, lval, rval) ((lval) = (type)(rval))
 #endif
 
 #define STRICT_ASSIGN(type, lval, rval) ((lval) = (type)(rval))
 #endif
 

-/* complex */
-
-#ifndef CMPLX
-#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
-

 #endif
 #endif