mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 71163 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71163 | benjamin.peterson | 2009-04-04 11:05:51 -0500 (Sat, 04 Apr 2009) | 1 line

  revert r71159 since it broke the build
........
This commit is contained in:
Benjamin Peterson 2009-04-04 16:10:42 +00:00
parent db5d6dc6de
commit 08c5c0bb55
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/object.h
View file

@ -746,13 +746,11 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
((PyObject*)(op))->ob_refcnt++) ((PyObject*)(op))->ob_refcnt++)
#define Py_DECREF(op) \ #define Py_DECREF(op) \
do { \
if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \
--((PyObject*)(op))->ob_refcnt != 0) \ --((PyObject*)(op))->ob_refcnt != 0) \
_Py_CHECK_REFCNT(op) \ _Py_CHECK_REFCNT(op) \
else \ else \
_Py_Dealloc((PyObject *)(op)) \ _Py_Dealloc((PyObject *)(op))
} while (0)
/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
* and tp_dealloc implementatons. * and tp_dealloc implementatons.

2
Misc/NEWS
View file

@ -92,8 +92,6 @@ Core and Builtins
- Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with - Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with
short file names. short file names.
- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.
Library Library
------- -------