summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2013-12-15 20:02:28 (GMT)
committerStefan Krah <skrah@bytereef.org>2013-12-15 20:02:28 (GMT)
commitcd81520e445d046b459f0eeba456ef05989a71b0 (patch)
tree09a0c8dbbea4ce142a6fed590b5f220c93284f82
parentae01a8bcdfb4117843e9e0f97ecac9aa9ffd7230 (diff)
parente259f138749fea616f79ad99088d1ee1fe4cca4b (diff)
downloadcpython-cd81520e445d046b459f0eeba456ef05989a71b0.zip
cpython-cd81520e445d046b459f0eeba456ef05989a71b0.tar.gz
cpython-cd81520e445d046b459f0eeba456ef05989a71b0.tar.bz2
Merge.
-rw-r--r--Objects/setobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c
index adc99da..b0803f6 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -36,9 +36,6 @@ static PyObject _dummy_struct;
#define dummy (&_dummy_struct)
-/* Exported for the gdb plugin's benefit. */
-PyObject *_PySet_Dummy = dummy;
-
/* ======================================================================== */
/* ======= Begin logic for probing the hash table ========================= */
@@ -2345,6 +2342,9 @@ _PySet_Update(PyObject *set, PyObject *iterable)
return set_update_internal((PySetObject *)set, iterable);
}
+/* Exported for the gdb plugin's benefit. */
+PyObject *_PySet_Dummy = dummy;
+
#ifdef Py_DEBUG
/* Test code to be called with any three element set.