]> granicus.if.org Git - python/commitdiff
Cray fixup as seen in bug #558153.
authorMichael W. Hudson <mwh@python.net>
Wed, 31 Jul 2002 09:54:24 +0000 (09:54 +0000)
committerMichael W. Hudson <mwh@python.net>
Wed, 31 Jul 2002 09:54:24 +0000 (09:54 +0000)
Modules/_sre.c

index 5805d5cbc7618a235a0f033286d98f07d8490ba5..f4dbef042f13734284f3335b56151ac8f1dc2860 100644 (file)
@@ -1785,7 +1785,7 @@ deepcopy(PyObject** object, PyObject* memo)
 #endif
 
 static PyObject*
-join(PyObject* list, PyObject* pattern)
+join_list(PyObject* list, PyObject* pattern)
 {
     /* join list elements */
 
@@ -2238,7 +2238,7 @@ next:
     Py_DECREF(filter);
 
     /* convert list to single string (also removes list) */
-    item = join(list, self->pattern);
+    item = join_list(list, self->pattern);
 
     if (!item)
         return NULL;