Check in the changed version after running the stubber again -- this

solves the conflict with curses over the 'clear' entry point much
nicer.  (Jack had checked in the changes to cstubs eons ago, but I
never regenrated glmodule.c :-( )

diff --git a/Modules/glmodule.c b/Modules/glmodule.c
index 610ecf390ccf83f8be416a289c3c83105ce50f74..980542001c0f08ade4ec6aadbf621b0c83c673f6 100644 (file)
--- a/Modules/glmodule.c
+++ b/Modules/glmodule.c
@@ -867,6 +867,17 @@ gl_gversion(self, args)
 }
 
 
+/* void clear - Manual because of clash with termcap */
+static PyObject *
+gl_clear(self, args)
+       PyObject *self;
+       PyObject *args;
+{
+       __GLclear( );
+       Py_INCREF(Py_None);
+       return Py_None;
+}
+
 /* End of manually written stubs */
 
 
@@ -1008,18 +1019,6 @@ gl_popviewport(self, args)
        return Py_None;
 }
 
-/* void clear */
-
-static PyObject *
-gl_clear(self, args)
-       PyObject *self;
-       PyObject *args;
-{
-       clear( );
-       Py_INCREF(Py_None);
-       return Py_None;
-}
-
 /* void clearhitcode */
 
 static PyObject *
@@ -8096,6 +8095,7 @@ static struct PyMethodDef gl_methods[] = {
        {"packrect", gl_packrect},
        {"unpackrect", gl_unpackrect},
        {"gversion", gl_gversion},
+       {"clear", gl_clear},
        {"getshade", gl_getshade},
        {"devport", gl_devport},
        {"rdr2i", gl_rdr2i},
@@ -8104,7 +8104,6 @@ static struct PyMethodDef gl_methods[] = {
        {"rmv2i", gl_rmv2i},
        {"noport", gl_noport},
        {"popviewport", gl_popviewport},
-       {"clear", gl_clear},
        {"clearhitcode", gl_clearhitcode},
        {"closeobj", gl_closeobj},
        {"cursoff", gl_cursoff},