diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
| commit | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (patch) | |
| tree | c673d91d8fe112d194cb9bbf45006b8b35838965 /Objects/unicodeobject.c | |
| parent | 9f2e346911988cda95fec7c901e8d10d34fa9563 (diff) | |
| download | cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.zip cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.gz cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.bz2 | |
Fix merge breakage.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index bf031bb..6944eab 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -305,7 +305,7 @@ void unicode_dealloc(register PyUnicodeObject *unicode) case SSTATE_INTERNED_MORTAL: /* revive dead object temporarily for DelItem */ - unicode->ob_refcnt = 3; + Py_Refcnt(unicode) = 3; if (PyDict_DelItem(interned, (PyObject *)unicode) != 0) Py_FatalError( "deletion of interned unicode string failed"); @@ -8758,7 +8758,7 @@ PyUnicode_InternInPlace(PyObject **p) PyThreadState_GET()->recursion_critical = 0; /* The two references in interned are not counted by refcnt. The deallocator will take care of this */ - s->ob_refcnt -= 2; + Py_Refcnt(s) -= 2; PyUnicode_CHECK_INTERNED(s) = SSTATE_INTERNED_MORTAL; } @@ -8812,11 +8812,11 @@ void _Py_ReleaseInternedUnicodeStrings(void) /* XXX Shouldn't happen */ break; case SSTATE_INTERNED_IMMORTAL: - s->ob_refcnt += 1; + Py_Refcnt(s) += 1; immortal_size += s->length; break; case SSTATE_INTERNED_MORTAL: - s->ob_refcnt += 2; + Py_Refcnt(s) += 2; mortal_size += s->length; break; default: |