diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/import.h | 25 | ||||
| -rw-r--r-- | Include/modsupport.h | 4 | ||||
| -rw-r--r-- | Include/object.h | 3 | ||||
| -rw-r--r-- | Include/pystate.h | 3 |
4 files changed, 8 insertions, 27 deletions
diff --git a/Include/import.h b/Include/import.h index 5463c0c..7e83985 100644 --- a/Include/import.h +++ b/Include/import.h @@ -38,25 +38,11 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject( ); #endif PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); -#ifndef Py_LIMITED_API -PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *); -#endif -PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name); -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyImport_GetModule(PyObject *name); -PyAPI_FUNC(PyObject *) _PyImport_GetModuleWithError(PyObject *name); -PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name); -PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module); -PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module); -#endif #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 PyAPI_FUNC(PyObject *) PyImport_AddModuleObject( PyObject *name ); #endif -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *); -#endif PyAPI_FUNC(PyObject *) PyImport_AddModule( const char *name /* UTF-8 encoded string */ ); @@ -106,19 +92,14 @@ PyAPI_FUNC(int) _PyImport_ReleaseLock(void); PyAPI_FUNC(void) _PyImport_ReInitLock(void); PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin( - const char *name, /* UTF-8 encoded string */ - PyObject *modules + const char *name /* UTF-8 encoded string */ ); PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObjectEx(PyObject *, PyObject *, - PyObject *); PyAPI_FUNC(int) _PyImport_FixupBuiltin( PyObject *mod, - const char *name, /* UTF-8 encoded string */ - PyObject *modules + const char *name /* UTF-8 encoded string */ ); -PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, - PyObject *, PyObject *); +PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); struct _inittab { const char *name; /* ASCII encoded string */ diff --git a/Include/modsupport.h b/Include/modsupport.h index 73d86a9..8c7cf39 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -191,10 +191,6 @@ PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def); PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*, int apiver); -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyModule_CreateInitialized(struct PyModuleDef*, - int apiver); -#endif #ifdef Py_LIMITED_API #define PyModule_Create(module) \ diff --git a/Include/object.h b/Include/object.h index 9bb780e..b46d4c3 100644 --- a/Include/object.h +++ b/Include/object.h @@ -727,13 +727,14 @@ PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); /* Py_REF_DEBUG also controls the display of refcounts and memory block * allocations at the interactive prompt and at interpreter shutdown */ -PyAPI_FUNC(PyObject *) _PyDebug_XOptionShowRefCount(void); PyAPI_FUNC(void) _PyDebug_PrintTotalRefs(void); +#define _PY_DEBUG_PRINT_TOTAL_REFS() _PyDebug_PrintTotalRefs() #else #define _Py_INC_REFTOTAL #define _Py_DEC_REFTOTAL #define _Py_REF_DEBUG_COMMA #define _Py_CHECK_REFCNT(OP) /* a semicolon */; +#define _PY_DEBUG_PRINT_TOTAL_REFS() #endif /* Py_REF_DEBUG */ #ifdef COUNT_ALLOCS diff --git a/Include/pystate.h b/Include/pystate.h index 5b75bb0..0906114 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -53,6 +53,7 @@ typedef struct _is { int64_t id; + PyObject *modules; PyObject *modules_by_index; PyObject *sysdict; PyObject *builtins; @@ -60,6 +61,8 @@ typedef struct _is { /* Used in Python/sysmodule.c. */ int check_interval; + PyObject *warnoptions; + PyObject *xoptions; /* Used in Modules/_threadmodule.c. */ long num_threads; |