Commit 1b21f1f3 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge pull request #359 from larsmans/npymath

fix erroneous prototypes for npy_logaddexp*
parents cf0b3f2c 10bd329d
...@@ -40,6 +40,9 @@ Bugs fixed ...@@ -40,6 +40,9 @@ Bugs fixed
* Failure to find any files for the path pattern(s) passed into ``cythonize()`` * Failure to find any files for the path pattern(s) passed into ``cythonize()``
is now an error to more easily detect accidental typos. is now an error to more easily detect accidental typos.
* The ``logaddexp`` family of functions in ``numpy.math`` now has correct
declarations.
Other changes Other changes
------------- -------------
......
...@@ -119,15 +119,15 @@ cdef extern from "numpy/npy_math.h" nogil: ...@@ -119,15 +119,15 @@ cdef extern from "numpy/npy_math.h" nogil:
# NumPy extensions # NumPy extensions
float deg2radf "npy_deg2radf"(float x) float deg2radf "npy_deg2radf"(float x)
float rad2degf "npy_rad2degf"(float x) float rad2degf "npy_rad2degf"(float x)
float logaddexpf "npy_logaddexpf"(float x) float logaddexpf "npy_logaddexpf"(float x, float y)
float logaddexp2f "npy_logaddexp2f"(float x) float logaddexp2f "npy_logaddexp2f"(float x, float y)
double deg2rad "npy_deg2rad"(double x) double deg2rad "npy_deg2rad"(double x)
double rad2deg "npy_rad2deg"(double x) double rad2deg "npy_rad2deg"(double x)
double logaddexp "npy_logaddexp"(double x) double logaddexp "npy_logaddexp"(double x, double y)
double logaddexp2 "npy_logaddexp2"(double x) double logaddexp2 "npy_logaddexp2"(double x, double y)
long double deg2radl "npy_deg2radl"(long double x) long double deg2radl "npy_deg2radl"(long double x)
long double rad2degl "npy_rad2degl"(long double x) long double rad2degl "npy_rad2degl"(long double x)
long double logaddexpl "npy_logaddexpl"(long double x) long double logaddexpl "npy_logaddexpl"(long double x, long double y)
long double logaddexp2l "npy_logaddexp2l"(long double x) long double logaddexp2l "npy_logaddexp2l"(long double x, long double y)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment