| tedbo | 023d9f7 | 2010-03-02 20:20:39 -0800 | [diff] [blame] | 1 | --- numpy/core/include/numpy/ufuncobject.h.orig 2009-07-28 15:04:42 -0400 |
| 2 | +++ numpy/core/include/numpy/ufuncobject.h 2009-07-28 15:05:58 -0400 |
| 3 | @@ -318,8 +318,10 @@ |
| 4 | |
| 5 | #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) |
| 6 | |
| 7 | -#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__) |
| 8 | +#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) |
| 9 | #include <fenv.h> |
| 10 | +#elif defined(__FreeBSD__) |
| 11 | +#include "fenv/fenv.h" |
| 12 | #elif defined(__CYGWIN__) |
| 13 | #include "fenv/fenv.c" |
| 14 | #endif |
| 15 | --- numpy/numarray/_capi.c.orig 2009-07-28 15:18:13 -0400 |
| 16 | +++ numpy/numarray/_capi.c 2009-07-28 15:19:04 -0400 |
| 17 | @@ -8,8 +8,10 @@ |
| 18 | #include <sys/param.h> |
| 19 | #endif |
| 20 | |
| 21 | -#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) |
| 22 | +#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) |
| 23 | #include <fenv.h> |
| 24 | +#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) |
| 25 | +#include "numpy/fenv/fenv.h" |
| 26 | #elif defined(__CYGWIN__) |
| 27 | #include "numpy/fenv/fenv.h" |
| 28 | #include "numpy/fenv/fenv.c" |