summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2013-12-01 01:58:53 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2013-12-01 01:58:53 (GMT)
commit2ccf8e969c5e870a6c416ac7970c9f94c0da86fd (patch)
tree9a56def10252b7ab1e154db3f23c64a0aa5481f3 /Include
parent3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1 (diff)
parent65846c6c5190a92446176f318fd837c6005cfa29 (diff)
downloadcpython-2ccf8e969c5e870a6c416ac7970c9f94c0da86fd.zip
cpython-2ccf8e969c5e870a6c416ac7970c9f94c0da86fd.tar.gz
cpython-2ccf8e969c5e870a6c416ac7970c9f94c0da86fd.tar.bz2
Issue #6477: Merge with 3.3.
Diffstat (limited to 'Include')
-rw-r--r--Include/object.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Include/object.h b/Include/object.h
index cc22ae9..f539652 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -829,8 +829,8 @@ 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;
+PyAPI_DATA(PyTypeObject) _PyNone_Type;
+PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
/*
_Py_NoneStruct is an object of undefined type which can be used in contexts