diff --git a/ChangeLog b/ChangeLog index a5cbdea82..ad6452d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-24 Robert Larice + * src/include/complex.h : + ngcomplex_t instead of complex, #2/2 + rename the structure as well + 2010-10-24 Robert Larice * src/frontend/com_compose.c , * src/frontend/com_fft.c , diff --git a/src/include/complex.h b/src/include/complex.h index b81625c86..fbeaef9d9 100644 --- a/src/include/complex.h +++ b/src/include/complex.h @@ -7,19 +7,15 @@ /* Complex numbers. */ -struct _complex1 { /* IBM portability... renamed due to double definition in MINGW32*/ +struct ngcomplex { double cx_real; double cx_imag; } ; -#ifdef _MSC_VER -typedef struct _complex1 _complex; -#endif +typedef struct ngcomplex ngcomplex_t; -typedef struct _complex1 ngcomplex_t; - -#define realpart(cval) ((struct _complex1 *) (cval))->cx_real -#define imagpart(cval) ((struct _complex1 *) (cval))->cx_imag +#define realpart(cval) ((struct ngcomplex *) (cval))->cx_real +#define imagpart(cval) ((struct ngcomplex *) (cval))->cx_imag #ifdef CIDER /* From Cider numcomplex.h