diff options
| author | Larry Hastings <larry@hastings.org> | 2014-02-11 00:15:46 -0800 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-02-11 00:15:46 -0800 |
| commit | e76f8af4cca30df0e9a99b6b1785d3ca90cbb1f4 (patch) | |
| tree | cbfdb7c9e610e039c3d57868effbf0b8a570e208 /Include | |
| parent | 5385827b238e174b00e6ae2a83bcf78c6a0a5641 (diff) | |
| parent | 8380617720587f57a5e20d6fcaddf2f489f20372 (diff) | |
| download | cpython-e76f8af4cca30df0e9a99b6b1785d3ca90cbb1f4.tar.gz | |
Merge Python 3.4.0rc1 release branch.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/moduleobject.h | 1 | ||||
| -rw-r--r-- | Include/pystate.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Include/moduleobject.h b/Include/moduleobject.h index 8013dd9b48..f119364b88 100644 --- a/Include/moduleobject.h +++ b/Include/moduleobject.h @@ -25,6 +25,7 @@ PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *); PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *); #ifndef Py_LIMITED_API PyAPI_FUNC(void) _PyModule_Clear(PyObject *); +PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *); #endif PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*); PyAPI_FUNC(void*) PyModule_GetState(PyObject*); diff --git a/Include/pystate.h b/Include/pystate.h index 1f3465fdbd..4992c22684 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -33,7 +33,6 @@ typedef struct _is { int codecs_initialized; int fscodec_initialized; - #ifdef HAVE_DLOPEN int dlopenflags; #endif @@ -41,6 +40,7 @@ typedef struct _is { int tscdump; #endif + PyObject *builtins_copy; } PyInterpreterState; #endif |