summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-10-21 16:10:40 (GMT)
committerGuido van Rossum <guido@python.org>1998-10-21 16:10:40 (GMT)
commit89733a8bd6a9f730cddd37a7a6941fb049472131 (patch)
tree1797ca62c6bfef417bfbbf2c6bdbcdfd9248718b
parenta9832bc5721fe218f86a2a8165830646663352f3 (diff)
downloadcpython-89733a8bd6a9f730cddd37a7a6941fb049472131.zip
cpython-89733a8bd6a9f730cddd37a7a6941fb049472131.tar.gz
cpython-89733a8bd6a9f730cddd37a7a6941fb049472131.tar.bz2
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 :-( )
-rw-r--r--Modules/glmodule.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/Modules/glmodule.c b/Modules/glmodule.c
index 610ecf3..9805420 100644
--- 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},