commit b6a45051234fd17ce1bedc1d91af1de9f630f162
author Michael W. Hudson <mwh@python.net> Wed Jul 31 09:54:24 2002 +0000
committer Michael W. Hudson <mwh@python.net> Wed Jul 31 09:54:24 2002 +0000
tree 14b7681c41949c4f6a1b731a63b7450c64199eda
parent 543fb35cca90b94f6d841a7081bb918eb6eb7c84

Cray fixup as seen in bug #558153.

Modules/_sre.c

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 5805d5c..f4dbef0 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -1785,7 +1785,7 @@
 #endif
 
 static PyObject*
-join(PyObject* list, PyObject* pattern)
+join_list(PyObject* list, PyObject* pattern)
 {
     /* join list elements */
 
@@ -2238,7 +2238,7 @@
     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;