diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-18 23:42:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 23:42:55 +0100 |
| commit | 6efcb6d3d5911aaf699f9df3bb3bc26e94f38e6d (patch) | |
| tree | 2f7c542cdd6c293b8d24efd198e6a9fb3b36585e | |
| parent | d757aaf9dd767d13205bf9917e520ebf43e7f6e5 (diff) | |
| download | cpython-git-6efcb6d3d5911aaf699f9df3bb3bc26e94f38e6d.tar.gz | |
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
| -rw-r--r-- | Modules/main.c | 24 | ||||
| -rw-r--r-- | Programs/python.c | 8 |
2 files changed, 14 insertions, 18 deletions
diff --git a/Modules/main.c b/Modules/main.c index 00de7f0d18..4312ef7a1f 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 a295486d73..78e48f800c 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) { |