[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (issue #24520)

[victor.stinner]

https://hg.python.org/cpython/rev/6134d9ecab60
changeset:   100006:6134d9ecab60
parent:      100004:775b74e0e103
parent:      100005:76f35f35be50
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jan 20 22:28:10 2016 +0100
summary:
  Merge 3.5 (issue #24520)

files:
  Programs/python.c |  8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)


diff --git a/Programs/python.c b/Programs/python.c
--- a/Programs/python.c
+++ b/Programs/python.c
@@ -4,7 +4,7 @@
 #include <locale.h>
 
 #ifdef __FreeBSD__
-#include <floatingpoint.h>
+#include <fenv.h>
 #endif
 
 #ifdef MS_WINDOWS
@@ -23,9 +23,6 @@
     wchar_t **argv_copy2;
     int i, res;
     char *oldloc;
-#ifdef __FreeBSD__
-    fp_except_t m;
-#endif
 
     argv_copy = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1));
     argv_copy2 = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1));
@@ -40,8 +37,7 @@
      * exceptions by default.  Here we disable them.
      */
 #ifdef __FreeBSD__
-    m = fpgetmask();
-    fpsetmask(m & ~FP_X_OFL);
+    fedisableexcept(FE_OVERFLOW);
 #endif
 
     oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL));

-- 
Repository URL: https://hg.python.org/cpython