bpo-32030: Fix compilation on FreeBSD, #include <fenv.h> (#4919)

* main.c: add missing #include <fenv.h> on FreeBSD
* indent also other #ifdef in main.c
* cleanup Programs/python.c

diff --git a/Modules/main.c b/Modules/main.c
index 00de7f0d181de57abba4ac176b720a2d82a78500..4312ef7a1fdfe4449684183036315f13c00261f8 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -9,23 +9,27 @@
 #include <locale.h>
 
 #if defined(MS_WINDOWS) || defined(__CYGWIN__)
-#include <windows.h>
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#  include <windows.h>
+#  ifdef HAVE_IO_H
+#    include <io.h>
+#  endif
+#  ifdef HAVE_FCNTL_H
+#    include <fcntl.h>
+#  endif
 #endif
 
 #ifdef _MSC_VER
-#include <crtdbg.h>
+#  include <crtdbg.h>
+#endif
+
+#ifdef __FreeBSD__
+#  include <fenv.h>
 #endif
 
 #if defined(MS_WINDOWS)
-#define PYTHONHOMEHELP "<prefix>\\python{major}{minor}"
+#  define PYTHONHOMEHELP "<prefix>\\python{major}{minor}"
 #else
-#define PYTHONHOMEHELP "<prefix>/lib/pythonX.X"
+#  define PYTHONHOMEHELP "<prefix>/lib/pythonX.X"
 #endif
 
 #define COPYRIGHT \

diff --git a/Programs/python.c b/Programs/python.c
index a295486d73f6b8f1cc29c8301a55eef7c5210fa3..78e48f800c950530e36d3712d9e2e89673f23562 100644 (file)
--- a/Programs/python.c
+++ b/Programs/python.c
@@ -1,12 +1,6 @@
 /* Minimal main program -- everything is loaded from the library */
 
 #include "Python.h"
-#include "internal/pystate.h"
-#include <locale.h>
-
-#ifdef __FreeBSD__
-#include <fenv.h>
-#endif
 
 #ifdef MS_WINDOWS
 int
@@ -15,8 +9,6 @@ wmain(int argc, wchar_t **argv)
     return Py_Main(argc, argv);
 }
 #else
-
-
 int
 main(int argc, char **argv)
 {