diff options
| -rw-r--r-- | Include/pyport.h | 15 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/python.c | 15 |
3 files changed, 26 insertions, 5 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index e9a0155..6a9b7e6 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -255,10 +255,15 @@ extern "C" { * if the returned result is a NaN, or if a C89 box returns HUGE_VAL * in non-overflow cases. * X is evaluated more than once. + * Some platforms have better way to spell this, so expect some #ifdef'ery. */ +#ifdef __FreeBSD__ +#define Py_OVERFLOWED(X) isinf(X) +#else #define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE || \ (X) == Py_HUGE_VAL || \ (X) == -Py_HUGE_VAL)) +#endif /* Py_SET_ERANGE_ON_OVERFLOW(x) * If a libm function did not set errno, but it looks like the result @@ -320,7 +325,7 @@ extern "C" { #if defined(__GNUC__) && (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) #define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__)) #else -#define Py_DEPRECATED(VERSION_UNUSED) +#define Py_DEPRECATED(VERSION_UNUSED) #endif /************************************************************************** @@ -395,17 +400,17 @@ extern double hypot(double, double); /* Declarations for symbol visibility. PyAPI_FUNC(type): Declares a public Python API function and return type - PyAPI_DATA(type): Declares public Python data and its type + PyAPI_DATA(type): Declares public Python data and its type PyMODINIT_FUNC: A Python module init function. If these functions are - inside the Python core, they are private to the core. - If in an extension module, it may be declared with + inside the Python core, they are private to the core. + If in an extension module, it may be declared with external linkage depending on the platform. As a number of platforms support/require "__declspec(dllimport/dllexport)", we support a HAVE_DECLSPEC_DLL macro to save duplication. */ -/* +/* All windows ports, except cygwin, are handled in PC/pyconfig.h BeOS is only other autoconf platform requiring special linkage handling and both these use __declspec() @@ -303,6 +303,7 @@ Cameron Laird Detlef Lannert Soren Larsen Piers Lauder +Ben Laurie Chris Lawrence Christopher Lee Inyeol Lee diff --git a/Modules/python.c b/Modules/python.c index f9262e8..2739b8b 100644 --- a/Modules/python.c +++ b/Modules/python.c @@ -2,8 +2,23 @@ #include "Python.h" +#ifdef __FreeBSD__ +#include <floatingpoint.h> +#endif + int main(int argc, char **argv) { + /* 754 requires that FP exceptions run in "no stop" mode by default, + * and until C vendors implement C99's ways to control FP exceptions, + * Python requires non-stop mode. Alas, some platforms enable FP + * exceptions by default. Here we disable them. + */ +#ifdef __FreeBSD__ + fp_except_t m; + + m = fpgetmask(); + fpsetmask(m & ~FP_X_OFL); +#endif return Py_Main(argc, argv); } |