[Python-checkins] bpo-32030: Fix compilation on FreeBSD, #include <fenv.h> (#4919)
Victor Stinner
webhook-mailer at python.org
Mon Dec 18 17:42:58 EST 2017
https://github.com/python/cpython/commit/6efcb6d3d5911aaf699f9df3bb3bc26e94f38e6d
commit: 6efcb6d3d5911aaf699f9df3bb3bc26e94f38e6d
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-12-18T23:42:55+01:00
summary:
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
files:
M Modules/main.c
M Programs/python.c
diff --git a/Modules/main.c b/Modules/main.c
index 00de7f0d181..4312ef7a1fd 100644
--- 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 a295486d73f..78e48f800c9 100644
--- 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)
{
More information about the Python-checkins
mailing list