From: Michael W. Hudson <mwh@python.net>
Date: Wed, 31 Jul 2002 09:54:24 +0000 (+0000)
Subject: Cray fixup as seen in bug #558153.
X-Git-Tag: v2.3c1~4817
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6a45051234fd17ce1bedc1d91af1de9f630f162;p=python

Cray fixup as seen in bug #558153.
---

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 5805d5cbc7..f4dbef042f 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -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;