| commit | 825b50a40f394e7f2e33b1ceccc23e5877346172 | [log] [tgz] |
|---|---|---|
| author | R David Murray <rdmurray@bitdance.com> | Wed Sep 18 07:34:13 2013 -0400 |
| committer | R David Murray <rdmurray@bitdance.com> | Wed Sep 18 07:34:13 2013 -0400 |
| tree | af8edb433059420245d5c32be57d13992ef1827c | |
| parent | 0648bf795c1e036cc398e4077c4e5e952b2bb087 [diff] | |
| parent | fb9dc0b3ae1e048c89988fcf4c570cd73da2f455 [diff] |
Merge heads.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index da09aa0..57503d5 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c
@@ -103,7 +103,7 @@ /* Py_CLEAR for a PyObject* that uses a join flag. Pass the pointer by * reference since this function sets it to NULL. */ -void _clear_joined_ptr(PyObject **p) +static void _clear_joined_ptr(PyObject **p) { if (*p) { PyObject *tmp = JOIN_OBJ(*p);