Commit 7172f50
committed
Replace fpgetmask() with fedisableexcept()
Issue python#24520: On FreeBSD, fpgetmask() was deprecated long time ago.
fedisableexcept() is now preferred.1 parent 6a0514e commit 7172f50
1 file changed
Lines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ | |||
| 4 | 4 | #include <locale.h> | |
| 5 | 5 | ||
| 6 | 6 | #ifdef __FreeBSD__ | |
| 7 | - #include <floatingpoint.h> | ||
| 7 | + #include <fenv.h> | ||
| 8 | 8 | #endif | |
| 9 | 9 | ||
| 10 | 10 | #ifdef MS_WINDOWS | |
@@ -23,9 +23,6 @@ main(int argc, char **argv) | |||
| 23 | 23 | wchar_t **argv_copy2; | |
| 24 | 24 | int i, res; | |
| 25 | 25 | char *oldloc; | |
| 26 | - #ifdef __FreeBSD__ | ||
| 27 | - fp_except_t m; | ||
| 28 | - #endif | ||
| 29 | 26 | ||
| 30 | 27 | argv_copy = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); | |
| 31 | 28 | argv_copy2 = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1)); | |
@@ -40,8 +37,7 @@ main(int argc, char **argv) | |||
| 40 | 37 | * exceptions by default. Here we disable them. | |
| 41 | 38 | */ | |
| 42 | 39 | #ifdef __FreeBSD__ | |
| 43 | - m = fpgetmask(); | ||
| 44 | - fpsetmask(m & ~FP_X_OFL); | ||
| 40 | + fedisableexcept(FE_OVERFLOW); | ||
| 45 | 41 | #endif | |
| 46 | 42 | ||
| 47 | 43 | oldloc = _PyMem_RawStrdup(setlocale(LC_ALL, NULL)); | |
0 commit comments