Merge pull request #292 from saraedum/patch-1

Fix clash of __hypot
This commit is contained in:
Fredrik Johansson 2019-09-11 18:51:22 +02:00 committed by GitHub
commit ef5ab30492
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -340,16 +340,16 @@ stieltjes_mag(double n)
return t; return t;
} }
static double __hypot(double x, double y) { return sqrt(x * x + y * y); } static double _d_approx_hypot(double x, double y) { return sqrt(x * x + y * y); }
/* log2 magnitude of integrand at z = x+yi; alpha = a+bi */ /* log2 magnitude of integrand at z = x+yi; alpha = a+bi */
static double static double
integrand_mag(double n, double x, double y, double a, double b) integrand_mag(double n, double x, double y, double a, double b)
{ {
double t, u; double t, u;
t = log(__hypot(a - y, b + x)); t = log(_d_approx_hypot(a - y, b + x));
u = atan2(b + x, a - y); u = atan2(b + x, a - y);
t = log(__hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x; t = log(_d_approx_hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x;
return t * 1.44269504088896341; return t * 1.44269504088896341;
} }