Attachment #136567 for bug #199825

Lines 223-228 Link Here

(-)numpy-1.0.4.old/numpy/core/include/numpy/ufuncobject.h (-3 / +7 lines)
223	/* This code checks the IEEE status flags in a platform-dependent way */	223	/* This code checks the IEEE status flags in a platform-dependent way */
224	/* Adapted from Numarray */	224	/* Adapted from Numarray */
225		225
		226	#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
		227	#include <sys/param.h>
		228	#endif
		229
226	/* OSF/Alpha (Tru64) ---------------------------------------------*/	230	/* OSF/Alpha (Tru64) ---------------------------------------------*/
227	#if defined(__osf__) && defined(__alpha)	231	#if defined(__osf__) && defined(__alpha)
228		232
Lines 267-273 Link Here
267	/* Solaris --------------------------------------------------------*/	271	/* Solaris --------------------------------------------------------*/
268	/* --------ignoring SunOS ieee_flags approach, someone else can	272	/* --------ignoring SunOS ieee_flags approach, someone else can
269	** deal with that! */	273	** deal with that! */
270	#elif defined(sun) \|\| defined(__BSD__) \|\| defined(__OpenBSD__) \|\| defined(__FreeBSD__) \|\| defined(__NetBSD__)	274	#elif defined(sun) \|\| defined(__BSD__) \|\| defined(__OpenBSD__) \|\| (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) \|\| defined(__NetBSD__)
271	#include <ieeefp.h>	275	#include <ieeefp.h>
272		276
273	#define UFUNC_CHECK_STATUS(ret) { \	277	#define UFUNC_CHECK_STATUS(ret) { \
Lines 281-289 Link Here
281	(void) fpsetsticky(0); \	285	(void) fpsetsticky(0); \
282	}	286	}
283		287
284	#elif defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__)	288	#elif defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__) \|\| (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
285		289
286	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__MINGW32__)	290	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__MINGW32__) \|\| defined(__FreeBSD__)
287	#include <fenv.h>	291	#include <fenv.h>
288	#elif defined(__CYGWIN__)	292	#elif defined(__CYGWIN__)
289	#include "fenv/fenv.c"	293	#include "fenv/fenv.c"

Lines 4-10 Link Here

(-)numpy-1.0.4.old/numpy/numarray/_capi.c (-3 / +7 lines)
4	#include "numpy/libnumarray.h"	4	#include "numpy/libnumarray.h"
5	#include <float.h>	5	#include <float.h>
6		6
7	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__MINGW32__)	7	#if (defined(__unix__) \|\| defined(unix)) && !defined(USG)
		8	#include <sys/param.h>
		9	#endif
		10
		11	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__MINGW32__) \|\| (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
8	#include <fenv.h>	12	#include <fenv.h>
9	#elif defined(__CYGWIN__)	13	#elif defined(__CYGWIN__)
10	#include "numpy/fenv/fenv.h"	14	#include "numpy/fenv/fenv.h"
Lines 231-237 Link Here
231	}	235	}
232		236
233	/* Likewise for Integer overflows */	237	/* Likewise for Integer overflows */
234	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__)	238	#if defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__) \|\| (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
235	static int int_overflow_error(Float64 value) { /* For x86_64 */	239	static int int_overflow_error(Float64 value) { /* For x86_64 */
236	feraiseexcept(FE_OVERFLOW);	240	feraiseexcept(FE_OVERFLOW);
237	return (int) value;	241	return (int) value;
Lines 2939-2945 Link Here
2939	return retstatus;	2943	return retstatus;
2940	}	2944	}
2941		2945
2942	#elif defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__)	2946	#elif defined(__GLIBC__) \|\| defined(__APPLE__) \|\| defined(__CYGWIN__) \|\| defined(__MINGW32__) \|\| (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
2943		2947
2944	static int	2948	static int
2945	NA_checkFPErrors(void)	2949	NA_checkFPErrors(void)

Return to bug 199825