[Python-checkins] cpython (merge default -> default): Trunk merge.

[barry.warsaw]

https://hg.python.org/cpython/rev/1ef6db8558b2
changeset:   94544:1ef6db8558b2
parent:      94543:9e6f79495e0b
parent:      94541:3a8d67d208e0
user:        Barry Warsaw <barry at python.org>
date:        Fri Feb 06 11:59:26 2015 -0500
summary:
  Trunk merge.

files:
  Objects/typeobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -565,7 +565,7 @@
 
 static PyTypeObject *best_base(PyObject *);
 static int mro_internal(PyTypeObject *, PyObject **);
-static int type_is_subtype_base_chain(PyTypeObject *, PyTypeObject *);
+Py_LOCAL_INLINE(int) type_is_subtype_base_chain(PyTypeObject *, PyTypeObject *);
 static int compatible_for_assignment(PyTypeObject *, PyTypeObject *, char *);
 static int add_subclass(PyTypeObject*, PyTypeObject*);
 static int add_all_subclasses(PyTypeObject *type, PyObject *bases);

-- 
Repository URL: https://hg.python.org/cpython