Changeset 3836

Timestamp:

Mar 16, 2014, 6:39:23 PM (12 years ago)

Author:

bird

Message:

build fixes

Location:

trunk/libc

Files:

• include/complex.h (modified) (1 diff)
• include/sys/cdefs.h (modified) (1 diff)
• src/libc/math/carg.c (modified) (1 diff)

trunk/libc/include/complex.h

@@ -48 +48 @@
 typedef struct __long_double_complex { long double __m_Real, __m_Imag; } __long_double_complex;
 #else
-# define __float_complex        __float_complex
-# define __double_complex       __double_complex
-# define __long_double_complex  __long_double_complex
+# define __float_complex        float complex
+# define __double_complex       double complex
+# define __long_double_complex  long double complex
 
 # define complex                _Complex

trunk/libc/include/sys/cdefs.h

@@ -174 +174 @@
 # define __KLIBC_COMPLEX_IMAG(a_uValue)     ( (a_uValue).__m_Imag )
 #else
-# define __KLIBC_COMPLEX_REAL(a_uValue)     real (a_uValue)
-# define __KLIBC_COMPLEX_IMAG(a_uValue)     imag (a_uValue)
+# define __KLIBC_COMPLEX_REAL(a_uValue)     __real__ (a_uValue)
+# define __KLIBC_COMPLEX_IMAG(a_uValue)     __imag__ (a_uValue)
 #endif
 

trunk/libc/src/libc/math/carg.c

@@ -11 +11 @@
 #include <math.h>
 
-long double _STD(carg)(__double_complex lird)
+double _STD(carg)(__double_complex ird)
 {
-    double lrdReal = __KLIBC_COMPLEX_REAL(lird);
-    double lrdImag = __KLIBC_COMPLEX_IMAG(lird);
-    return atan2(lrdReal, lrdImag);
+    double rdReal = __KLIBC_COMPLEX_REAL(ird);
+    double rdImag = __KLIBC_COMPLEX_IMAG(ird);
+    return atan2(rdReal, rdImag);
 }