From faea4c9937d36b17e53fdc7d5a254d7e936e1755 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 11 Dec 2012 22:44:36 +0100 Subject: [PATCH] make CMPLX macros available in complex.h in non-c11 mode as well --- include/complex.h | 2 -- src/internal/libm.h | 8 -------- 2 files changed, 10 deletions(-) diff --git a/include/complex.h b/include/complex.h index 8206e026..13a45c57 100644 --- 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) -#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) -#endif #ifdef __cplusplus } diff --git a/src/internal/libm.h b/src/internal/libm.h index 46c4b564..64cc8388 100644 --- 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 -/* 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 -- 2.20.1