diff options
| author | Raymond Hettinger <python@rcn.com> | 2013-10-01 08:00:59 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2013-10-01 08:00:59 (GMT) |
| commit | c13516b0a0fd3142b29e1f354c2080cd52948213 (patch) | |
| tree | c457578d34b0dc1edf54535d83244b1636b3b87a /Objects | |
| parent | 65870835a006ad613b111fe4579bd7e3354585b7 (diff) | |
| parent | 2ff2190b6293966f76633d810dfbe2d232ff5973 (diff) | |
| download | cpython-c13516b0a0fd3142b29e1f354c2080cd52948213.zip cpython-c13516b0a0fd3142b29e1f354c2080cd52948213.tar.gz cpython-c13516b0a0fd3142b29e1f354c2080cd52948213.tar.bz2 | |
merge
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 3ff42da..6826cf9 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -50,9 +50,6 @@ _Py_IDENTIFIER(__name__); _Py_IDENTIFIER(__new__); static PyObject * -_PyType_LookupId(PyTypeObject *type, struct _Py_Identifier *name); - -static PyObject * slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds); unsigned int @@ -2620,7 +2617,7 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name) return res; } -static PyObject * +PyObject * _PyType_LookupId(PyTypeObject *type, struct _Py_Identifier *name) { PyObject *oname; |