diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-06-16 09:42:14 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-06-16 09:43:22 +0200 |
| commit | 8e5ed9aa4c1ab255b7796df02fd9aa75fb72fb93 (patch) | |
| tree | db431dd19fbe531b215441d9e1310e302e8affbd | |
| parent | 7dc65761e66913aa34cc8afee052e89cc983fd4e (diff) | |
| parent | a111f60d2f32c58f9ea6862c9ce8e9c7f71c9ee7 (diff) | |
| download | numpy-8e5ed9aa4c1ab255b7796df02fd9aa75fb72fb93.tar.gz | |
Merge PR-3444 from 'jmozmoz:master' into master.
https://github.com/numpy/numpy/pull/3444
Fixed compilation with Cygwin.
| -rw-r--r-- | numpy/core/include/numpy/ufuncobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h index 75611426c..8df96a44f 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h @@ -212,7 +212,7 @@ typedef struct _tagPyUFuncObject { * A function which returns a masked inner loop for the ufunc. */ PyUFunc_MaskedInnerLoopSelectionFunc *masked_inner_loop_selector; - + /* * List of flags for each operand when ufunc is called by nditer object. * These flags will be used in addition to the default flags for each @@ -406,7 +406,7 @@ typedef struct _loop1d_info { defined(__MINGW32__) || defined(__FreeBSD__) #include <fenv.h> #elif defined(__CYGWIN__) -#include "fenv/fenv.c" +#include "numpy/fenv/fenv.h" #endif #define UFUNC_CHECK_STATUS(ret) { \ |