diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/import.h | 5 | ||||
| -rw-r--r-- | Include/py_curses.h | 2 | ||||
| -rw-r--r-- | Include/pyport.h | 11 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Include/import.h b/Include/import.h index af9f3394b13..05ad7f008a0 100644 --- a/Include/import.h +++ b/Include/import.h @@ -14,13 +14,10 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx( PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name); PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name); +PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *); PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist, int level); -/* For DLL compatibility */ -#undef PyImport_ImportModuleEx -PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx( - char *name, PyObject *globals, PyObject *locals, PyObject *fromlist); #define PyImport_ImportModuleEx(n, g, l, f) \ PyImport_ImportModuleLevel(n, g, l, f, -1) diff --git a/Include/py_curses.h b/Include/py_curses.h index 3cb23cc90f3..c6cbdbd5469 100644 --- a/Include/py_curses.h +++ b/Include/py_curses.h @@ -90,7 +90,7 @@ static void **PyCurses_API; #define import_curses() \ { \ - PyObject *module = PyImport_ImportModule("_curses"); \ + PyObject *module = PyImport_ImportModuleNoBlock("_curses"); \ if (module != NULL) { \ PyObject *module_dict = PyModule_GetDict(module); \ PyObject *c_api_object = PyDict_GetItemString(module_dict, "_C_API"); \ diff --git a/Include/pyport.h b/Include/pyport.h index 82d305ce323..e4da8f4347a 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -335,12 +335,19 @@ extern "C" { /* High precision defintion of pi and e (Euler) * The values are taken from libc6's math.h. */ +#ifndef Py_MATH_PIl +#define Py_MATH_PIl 3.1415926535897932384626433832795029L +#endif #ifndef Py_MATH_PI -#define Py_MATH_PI 3.1415926535897932384626433832795029L +#define Py_MATH_PI 3.14159265358979323846 +#endif + +#ifndef Py_MATH_El +#define Py_MATH_El 2.7182818284590452353602874713526625L #endif #ifndef Py_MATH_E -#define Py_MATH_E 2.7182818284590452353602874713526625L +#define Py_MATH_E 2.7182818284590452354 #endif /* Py_IS_NAN(X) |