diff --git a/i387/fenv.c b/i387/fenv.c index b6b26f7..b0a8744 100644 --- a/i387/fenv.c +++ b/i387/fenv.c @@ -26,10 +26,10 @@ * $FreeBSD: src/lib/msun/i387/fenv.c,v 1.8 2011/10/21 06:25:31 das Exp $ */ -#include -#include -#include -#include +#include "cdefs-compat.h" +#include "types-compat.h" +#include "math_private.h" +#include "i387/bsd_npx.h" #define __fenv_static #include diff --git a/src/bsd_cdefs.h b/src/bsd_cdefs.h index 1ef71ca..b0ceee3 100644 --- a/src/bsd_cdefs.h +++ b/src/bsd_cdefs.h @@ -93,7 +93,7 @@ * for a given compiler, let the compile fail if it is told to use * a feature that we cannot live without. */ -#if __GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER) +#if !defined(__pure2) && (__GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER)) #define __pure2 __attribute__((__const__)) #endif diff --git a/src/types-compat.h b/src/types-compat.h index 665c1e3..b20b5ae 100644 --- a/src/types-compat.h +++ b/src/types-compat.h @@ -3,17 +3,6 @@ #include #include -#include - -#ifdef __GLIBC__ -/* Not sure what to do about __pure2 on linux */ -#define __pure2 -#endif - -#ifdef _WIN32 -/* Not sure what to do about __pure2 on windows */ -#define __pure2 -#endif typedef uint8_t u_int8_t; typedef uint16_t u_int16_t;