summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2013-12-01 00:21:20 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2013-12-01 00:21:20 (GMT)
commit3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1 (patch)
tree600903588902508759b5ad8e3cbeb9d4b8329c1c /Include
parent9204af42cc271690f57a4bc0d2af53201a796b51 (diff)
parent19b6fa6ebb887e498437b4ae87d6e70b92b4742b (diff)
downloadcpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.zip
cpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.tar.gz
cpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.tar.bz2
Issue #6477: Merge with 3.3.
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h
index 8de2208..cc22ae9 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -829,6 +829,9 @@ they can have object code that is not dependent on Python compilation flags.
PyAPI_FUNC(void) Py_IncRef(PyObject *);
PyAPI_FUNC(void) Py_DecRef(PyObject *);
+PyAPI_DATA(PyTypeObject) PyNone_Type;
+PyAPI_DATA(PyTypeObject) PyNotImplemented_Type;
+
/*
_Py_NoneStruct is an object of undefined type which can be used in contexts
where NULL (nil) is not suitable (since NULL often means 'error').