[Python-checkins] cpython (merge default -> default): Merge.

Sun Dec 15 21:03:35 CET 2013

http://hg.python.org/cpython/rev/2dcf1482b3e6
changeset: 87970:2dcf1482b3e6
parent: 87969:936b35acec50
parent: 87967:24058a1eb022
user: Stefan Krah <skrah at bytereef.org>
date: Sun Dec 15 21:02:28 2013 +0100
summary:
 Merge.
files:
 Objects/setobject.c | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -36,9 +36,6 @@
 
 #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 @@
 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.
-- 
Repository URL: http://hg.python.org/cpython
