diff options
| author | Ryan Nelson <rnelsonchem@gmail.com> | 2014-12-02 08:46:58 -0500 |
|---|---|---|
| committer | Ryan Nelson <rnelsonchem@gmail.com> | 2014-12-04 11:12:55 -0500 |
| commit | b3121e856556ca2ca1cce22ab100d85dd702a30a (patch) | |
| tree | 60e1fb2372985c85cc37eb9a48865e5323eb1f40 /numpy/fft/fftpack.h | |
| parent | e31dcad0aca659acd89ca90ae5030731d0eccf91 (diff) | |
| download | numpy-b3121e856556ca2ca1cce22ab100d85dd702a30a.tar.gz | |
BUG: Rename fft C functions to avoid name conflict
Resolves issue #565.
The public fft functions defined in fftpack.c have name conflicts on certain
systems, so the prefix "npy_" was added to these functions.
Added NPY_VISIBILITY_HIDDEN to the public functions in both fftpack.h and
fftpack.c. This required rearranging the includes at the beginning of
fftpack_litemodule.c so that this macro was properly defined. In addition,
Python.h and numpy/ndarraytypes.h were included in the fftpack.h.
One function, rfftb1, was flagged as `static` as it was not exported in the
header.
Build and tests pass using both Python 2.7.8 and Python 3.4.2.
Diffstat (limited to 'numpy/fft/fftpack.h')
| -rw-r--r-- | numpy/fft/fftpack.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/fft/fftpack.h b/numpy/fft/fftpack.h index d134784a2..5e8f4631c 100644 --- a/numpy/fft/fftpack.h +++ b/numpy/fft/fftpack.h @@ -15,13 +15,13 @@ extern "C" { #define Treal float #endif -extern void cfftf(int N, Treal data[], const Treal wrk[]); -extern void cfftb(int N, Treal data[], const Treal wrk[]); -extern void cffti(int N, Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_cfftf(int N, Treal data[], const Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_cfftb(int N, Treal data[], const Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_cffti(int N, Treal wrk[]); -extern void rfftf(int N, Treal data[], const Treal wrk[]); -extern void rfftb(int N, Treal data[], const Treal wrk[]); -extern void rffti(int N, Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_rfftf(int N, Treal data[], const Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_rfftb(int N, Treal data[], const Treal wrk[]); +extern NPY_VISIBILITY_HIDDEN void npy_rffti(int N, Treal wrk[]); #ifdef __cplusplus } |