From b6a45051234fd17ce1bedc1d91af1de9f630f162 Mon Sep 17 00:00:00 2001
From: "Michael W. Hudson" <mwh@python.net>
Date: Wed, 31 Jul 2002 09:54:24 +0000
Subject: [PATCH] Cray fixup as seen in bug #558153.

---
 Modules/_sre.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/_sre.c b/Modules/_sre.c
index 5805d5cbc76..f4dbef042f1 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 @@ pattern_subx(PatternObject* self, PyObject* template, PyObject* string,
     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;