diff options
| -rw-r--r-- | numpy/core/include/numpy/ufuncobject.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h index 8df96a44f..aab336da8 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h @@ -370,8 +370,12 @@ typedef struct _loop1d_info { #define UFUNC_NOFPE _control87(MCW_EM, MCW_EM); #endif +/* windows enables sse on 32 bit, so check both flags */ #define UFUNC_CHECK_STATUS(ret) { \ - int fpstatus = (int) _clearfp(); \ + int fpstatus, fpstatus2; \ + _statusfp2(&fpstatus, &fpstatus2); \ + _clearfp(); \ + fpstatus |= fpstatus2; \ \ ret = ((SW_ZERODIVIDE & fpstatus) ? UFUNC_FPE_DIVIDEBYZERO : 0) \ | ((SW_OVERFLOW & fpstatus) ? UFUNC_FPE_OVERFLOW : 0) \ |