Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14827/Modules Modified Files: readline.c Log Message: Rename a static variable "history_length" to "_history_length". GNU readline exports a global variable that has such a name already and the collision makes gcc4 doesn't compile the source. Index: readline.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v retrieving revision 2.78 retrieving revision 2.79 diff -u -d -r2.78 -r2.79 --- readline.c 7 Oct 2004 13:46:33 -0000 2.78 +++ readline.c 25 Nov 2004 04:04:20 -0000 2.79 @@ -94,7 +94,7 @@ return Py_None; } -static int history_length = -1; /* do not truncate history by default */ +static int _history_length = -1; /* do not truncate history by default */ PyDoc_STRVAR(doc_read_history_file, "read_history_file([filename]) -> None\n\ Load a readline history file.\n\ @@ -110,8 +110,8 @@ if (!PyArg_ParseTuple(args, "|z:write_history_file", &s)) return NULL; errno = write_history(s); - if (!errno && history_length >= 0) - history_truncate_file(s, history_length); + if (!errno && _history_length >= 0) + history_truncate_file(s, _history_length); if (errno) return PyErr_SetFromErrno(PyExc_IOError); Py_INCREF(Py_None); @@ -129,10 +129,10 @@ static PyObject* set_history_length(PyObject *self, PyObject *args) { - int length = history_length; + int length = _history_length; if (!PyArg_ParseTuple(args, "i:set_history_length", &length)) return NULL; - history_length = length; + _history_length = length; Py_INCREF(Py_None); return Py_None; } @@ -149,7 +149,7 @@ static PyObject* get_history_length(PyObject *self, PyObject *noarg) { - return PyInt_FromLong(history_length); + return PyInt_FromLong(_history_length); } PyDoc_STRVAR(get_history_length_doc,