浏览代码

Never include <complex.h>. Include <openlibm_complex.h> instead.

If we ship with a separate copy of <complex.h>, we should also use this
one instead of the one provided by the system.
Ed Schouten 10 年之前
父节点
当前提交
08dbb2b517
共有 74 个文件被更改,包括 147 次插入127 次删除
  1. 2 2
      src/k_exp.c
  2. 2 2
      src/k_expf.c
  3. 2 1
      src/math_private.h
  4. 4 6
      src/openlibm.h
  5. 7 4
      src/openlibm_complex.h
  6. 2 2
      src/s_cabs.c
  7. 2 2
      src/s_cabsf.c
  8. 2 2
      src/s_cabsl.c
  9. 2 2
      src/s_cacos.c
  10. 2 2
      src/s_cacosf.c
  11. 2 2
      src/s_cacosh.c
  12. 2 2
      src/s_cacoshf.c
  13. 2 2
      src/s_cacoshl.c
  14. 2 2
      src/s_cacosl.c
  15. 2 1
      src/s_carg.c
  16. 2 1
      src/s_cargf.c
  17. 2 1
      src/s_cargl.c
  18. 2 2
      src/s_casin.c
  19. 2 2
      src/s_casinf.c
  20. 2 2
      src/s_casinh.c
  21. 2 2
      src/s_casinhf.c
  22. 2 2
      src/s_casinhl.c
  23. 2 2
      src/s_casinl.c
  24. 2 2
      src/s_catan.c
  25. 2 2
      src/s_catanf.c
  26. 2 2
      src/s_catanh.c
  27. 2 2
      src/s_catanhf.c
  28. 2 2
      src/s_catanhl.c
  29. 2 2
      src/s_catanl.c
  30. 2 2
      src/s_ccos.c
  31. 2 2
      src/s_ccosf.c
  32. 1 1
      src/s_ccosh.c
  33. 1 1
      src/s_ccoshf.c
  34. 2 2
      src/s_ccoshl.c
  35. 2 2
      src/s_ccosl.c
  36. 1 1
      src/s_cexp.c
  37. 1 1
      src/s_cexpf.c
  38. 2 2
      src/s_cexpl.c
  39. 3 2
      src/s_cimag.c
  40. 3 2
      src/s_cimagf.c
  41. 3 2
      src/s_cimagl.c
  42. 2 2
      src/s_clog.c
  43. 2 2
      src/s_clogf.c
  44. 2 2
      src/s_clogl.c
  45. 2 2
      src/s_conj.c
  46. 2 2
      src/s_conjf.c
  47. 2 2
      src/s_conjl.c
  48. 2 1
      src/s_cpow.c
  49. 2 1
      src/s_cpowf.c
  50. 2 1
      src/s_cpowl.c
  51. 1 1
      src/s_cproj.c
  52. 1 1
      src/s_cprojf.c
  53. 1 1
      src/s_cprojl.c
  54. 3 1
      src/s_creal.c
  55. 3 1
      src/s_crealf.c
  56. 3 1
      src/s_creall.c
  57. 2 2
      src/s_csin.c
  58. 2 2
      src/s_csinf.c
  59. 1 1
      src/s_csinh.c
  60. 1 1
      src/s_csinhf.c
  61. 2 2
      src/s_csinhl.c
  62. 2 2
      src/s_csinl.c
  63. 1 1
      src/s_csqrt.c
  64. 1 1
      src/s_csqrtf.c
  65. 1 1
      src/s_csqrtl.c
  66. 2 2
      src/s_ctan.c
  67. 2 2
      src/s_ctanf.c
  68. 1 1
      src/s_ctanh.c
  69. 1 1
      src/s_ctanhf.c
  70. 2 2
      src/s_ctanhl.c
  71. 2 2
      src/s_ctanl.c
  72. 2 1
      src/w_cabs.c
  73. 2 1
      src/w_cabsf.c
  74. 2 1
      src/w_cabsl.c

+ 2 - 2
src/k_exp.c

@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_exp.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const u_int32_t k = 1799;		/* constant for reduction */

+ 2 - 2
src/k_expf.c

@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/k_expf.c,v 1.1 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 static const u_int32_t k = 235;			/* constant for reduction */

+ 2 - 1
src/math_private.h

@@ -17,10 +17,11 @@
 #ifndef _MATH_PRIVATE_H_
 #define	_MATH_PRIVATE_H_
 
+#include <openlibm_complex.h>
+
 #include "cdefs-compat.h"
 #include "types-compat.h"
 #include "fpmath.h"
-#include <complex.h>
 #include <stdint.h>
 #include "math_private_openbsd.h"
 

+ 4 - 6
src/openlibm.h

@@ -14,10 +14,10 @@
  * $FreeBSD: src/lib/msun/src/openlibm.h,v 1.82 2011/11/12 19:55:48 theraven Exp $
  */
 
-#ifndef _MATH_H_
-#define	_MATH_H_
+#ifndef OPENLIBM_H
+#define	OPENLIBM_H
 
-#include <complex.h>
+#include <openlibm_complex.h>
 
 #if (defined(_WIN32) || defined (_MSC_VER)) && !defined(__WIN32__)
     #define __WIN32__
@@ -581,9 +581,7 @@ long double	truncl(long double);
 long double	lgammal_r(long double, int *);
 #endif	/* __BSD_VISIBLE */
 
-#include "openlibm_complex.h"
-
 #if defined(__cplusplus)
 }
 #endif
-#endif /* !_MATH_H_ */
+#endif /* !OPENLIBM_H */

+ 7 - 4
src/openlibm_complex.h

@@ -15,10 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _OPENLIBM_COMPLEX_H_
-#define	_OPENLIBM_COMPLEX_H_
+#ifndef OPENLIBM_COMPLEX_H
+#define	OPENLIBM_COMPLEX_H
 
-#include <sys/cdefs.h>
+#define complex _Complex
+
+#define _Complex_I 1.0fi
+#define I _Complex_I
 
 /*
  * Double versions of C99 functions
@@ -99,4 +102,4 @@ long double complex conjl(long double complex);
 long double complex cprojl(long double complex);
 long double creall(long double complex);
 
-#endif /* !_OPENLIBM_COMPLEX_H_ */
+#endif /* !OPENLIBM_COMPLEX_H */

+ 2 - 2
src/s_cabs.c

@@ -15,9 +15,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double
 cabs(double complex z)

+ 2 - 2
src/s_cabsf.c

@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float
 cabsf(float complex z)

+ 2 - 2
src/s_cabsl.c

@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double
 cabsl(long double complex z)

+ 2 - 2
src/s_cacos.c

@@ -46,9 +46,9 @@
  *    IEEE      -10,+10     30000      1.8e-14      2.2e-15
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 cacos(double complex z)

+ 2 - 2
src/s_cacosf.c

@@ -46,8 +46,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 cacosf(float complex z)

+ 2 - 2
src/s_cacosh.c

@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 cacosh(double complex z)

+ 2 - 2
src/s_cacoshf.c

@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 cacoshf(float complex z)

+ 2 - 2
src/s_cacoshl.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 cacoshl(long double complex z)

+ 2 - 2
src/s_cacosl.c

@@ -47,8 +47,8 @@
  *    IEEE      -10,+10     30000      1.8e-14      2.2e-15
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static const long double PIO2L = 1.570796326794896619231321691639751442098585L;
 

+ 2 - 1
src/s_carg.c

@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_carg.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double

+ 2 - 1
src/s_cargf.c

@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargf.c,v 1.1 2007/12/12 23:43:51 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float

+ 2 - 1
src/s_cargl.c

@@ -27,8 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cargl.c,v 1.1 2008/07/31 22:41:26 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double

+ 2 - 2
src/s_casin.c

@@ -49,9 +49,9 @@
  * Also tested by csin(casin(z)) = z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 casin(double complex z)

+ 2 - 2
src/s_casinf.c

@@ -47,8 +47,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 casinf(float complex z)

+ 2 - 2
src/s_casinh.c

@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 casinh(double complex z)

+ 2 - 2
src/s_casinhf.c

@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 casinhf(float complex z)

+ 2 - 2
src/s_casinhl.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 casinhl(long double complex z)

+ 2 - 2
src/s_casinl.c

@@ -49,9 +49,9 @@
  * Also tested by csin(casin(z)) = z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #if	LDBL_MANT_DIG == 64
 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;

+ 2 - 2
src/s_catan.c

@@ -62,9 +62,9 @@
  * 2.9e-17.  See also clog().
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MAXNUM 1.0e308
 

+ 2 - 2
src/s_catanf.c

@@ -59,8 +59,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MAXNUMF 1.0e38F
 

+ 2 - 2
src/s_catanh.c

@@ -42,9 +42,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 catanh(double complex z)

+ 2 - 2
src/s_catanhf.c

@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 catanhf(float complex z)

+ 2 - 2
src/s_catanhl.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 catanhl(long double complex z)

+ 2 - 2
src/s_catanl.c

@@ -63,9 +63,9 @@
  * 2.9e-17.  See also clog().
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static const long double PIL = 3.141592653589793238462643383279502884197169L;
 static const long double DP1 = 3.14159265358979323829596852490908531763125L;

+ 2 - 2
src/s_ccos.c

@@ -49,9 +49,9 @@
  *    IEEE      -10,+10     30000       3.8e-16     1.0e-16
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 

+ 2 - 2
src/s_ccosf.c

@@ -48,8 +48,8 @@
  *    IEEE      -10,+10     30000       1.8e-7       5.5e-8
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 

+ 1 - 1
src/s_ccosh.c

@@ -37,8 +37,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccosh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_ccoshf.c

@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ccoshf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 2 - 2
src/s_ccoshl.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 ccoshl(long double complex z)

+ 2 - 2
src/s_ccosl.c

@@ -50,8 +50,8 @@
  *    IEEE      -10,+10     30000       3.8e-16     1.0e-16
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static void
 cchshl(long double x, long double *c, long double *s)

+ 1 - 1
src/s_cexp.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexp.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_cexpf.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cexpf.c,v 1.3 2011/10/21 06:27:56 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 2 - 2
src/s_cexpl.c

@@ -54,8 +54,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 cexpl(long double complex z)

+ 3 - 2
src/s_cimag.c

@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimag.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double

+ 3 - 2
src/s_cimagf.c

@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimagf.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float

+ 3 - 2
src/s_cimagl.c

@@ -26,8 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_cimagl.c,v 1.3 2009/03/14 18:24:15 das Exp $
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double

+ 2 - 2
src/s_clog.c

@@ -54,9 +54,9 @@
  * absolute error 1.0e-16.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 double complex
 clog(double complex z)

+ 2 - 2
src/s_clogf.c

@@ -53,8 +53,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 float complex
 clogf(float complex z)

+ 2 - 2
src/s_clogl.c

@@ -55,8 +55,8 @@
  * absolute error 1.0e-16.
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 clogl(long double complex z)

+ 2 - 2
src/s_conj.c

@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conj.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT double complex

+ 2 - 2
src/s_conjf.c

@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conjf.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT float complex

+ 2 - 2
src/s_conjl.c

@@ -26,9 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_conjl.c,v 1.2 2008/08/07 14:39:56 das Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
-#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT long double complex

+ 2 - 1
src/s_cpow.c

@@ -44,9 +44,10 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double complex

+ 2 - 1
src/s_cpowf.c

@@ -44,8 +44,9 @@
  *
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float complex

+ 2 - 1
src/s_cpowl.c

@@ -45,8 +45,9 @@
  *
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double complex

+ 1 - 1
src/s_cproj.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cproj.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_cprojf.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojf.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_cprojl.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_cprojl.c,v 1.1 2008/08/07 15:07:48 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 3 - 1
src/s_creal.c

@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_creal.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double

+ 3 - 1
src/s_crealf.c

@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_crealf.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float

+ 3 - 1
src/s_creall.c

@@ -26,7 +26,9 @@
  * $FreeBSD: src/lib/msun/src/s_creall.c,v 1.1 2004/05/30 09:21:56 stefanf Exp $
  */
 
-#include <complex.h>
+#include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double

+ 2 - 2
src/s_csin.c

@@ -51,9 +51,9 @@
  *
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 

+ 2 - 2
src/s_csinf.c

@@ -49,8 +49,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 /* calculate cosh and sinh */
 

+ 1 - 1
src/s_csinh.c

@@ -37,8 +37,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinh.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_csinhf.c

@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csinhf.c,v 1.2 2011/10/21 06:29:32 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 2 - 2
src/s_csinhl.c

@@ -42,8 +42,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 csinhl(long double complex z)

+ 2 - 2
src/s_csinl.c

@@ -52,8 +52,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 static void
 cchshl(long double x, long double *c, long double *s)

+ 1 - 1
src/s_csqrt.c

@@ -27,9 +27,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.4 2008/08/08 00:15:16 das Exp $");
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_csqrtf.c

@@ -27,8 +27,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.3 2008/08/08 00:15:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_csqrtl.c

@@ -26,9 +26,9 @@
 
 #include "cdefs-compat.h"
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 2 - 2
src/s_ctan.c

@@ -56,9 +56,9 @@
  * Also tested by ctan * ccot = 1 and catan(ctan(z))  =  z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MACHEP 1.1e-16
 #define MAXNUM 1.0e308

+ 2 - 2
src/s_ctanf.c

@@ -53,8 +53,8 @@
  *    IEEE      -10,+10     30000       3.3e-7       5.1e-8
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #define MACHEPF 3.0e-8
 #define MAXNUMF 1.0e38f

+ 1 - 1
src/s_ctanh.c

@@ -66,8 +66,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanh.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 1 - 1
src/s_ctanhf.c

@@ -31,8 +31,8 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/s_ctanhf.c,v 1.2 2011/10/21 06:30:16 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
 
 #include "math_private.h"
 

+ 2 - 2
src/s_ctanhl.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <complex.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 long double complex
 ctanhl(long double complex z)

+ 2 - 2
src/s_ctanl.c

@@ -56,9 +56,9 @@
  * Also tested by ctan * ccot = 1 and catan(ctan(z))  =  z.
  */
 
-#include <complex.h>
 #include <float.h>
-#include "openlibm.h"
+#include <openlibm.h>
+#include <openlibm_complex.h>
 
 #if	LDBL_MANT_DIG == 64
 static const long double MACHEPL= 5.42101086242752217003726400434970855712890625E-20L;

+ 2 - 1
src/w_cabs.c

@@ -8,9 +8,10 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabs.c,v 1.7 2008/03/30 20:03:06 das Exp $");
 
-#include <complex.h>
 #include <float.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT double

+ 2 - 1
src/w_cabsf.c

@@ -5,8 +5,9 @@
  * Placed into the Public Domain, 1994.
  */
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT float

+ 2 - 1
src/w_cabsl.c

@@ -10,8 +10,9 @@
 #include "cdefs-compat.h"
 //__FBSDID("$FreeBSD: src/lib/msun/src/w_cabsl.c,v 1.1 2008/03/30 20:02:03 das Exp $");
 
-#include <complex.h>
 #include <openlibm.h>
+#include <openlibm_complex.h>
+
 #include "math_private.h"
 
 DLLEXPORT long double