diff -u -r Python-2.5/Modules/_ctypes/_ctypes.c lang/python/src/Modules/_ctypes/_ctypes.c
--- Python-2.5/Modules/_ctypes/_ctypes.c	2006-09-11 05:02:43.000000000 +0100
+++ lang/python/src/Modules/_ctypes/_ctypes.c	2007-02-15 23:16:42.000000000 +0000
@@ -2140,7 +2140,7 @@
  * default __ctypes_from_outparam__ method returns self.
  */
 static PyObject *
-CData_from_outparam(PyObject *self, PyObject *args)
+CData_from_outparam(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_INCREF(self);
 	return self;
@@ -4002,7 +4002,7 @@
 };
 
 static PyObject *
-Simple_from_outparm(PyObject *self, PyObject *args)
+Simple_from_outparm(PyObject *self, PyObject *NOARGS_NULL)
 {
 	if (IsSimpleSubType((PyObject *)self->ob_type)) {
 		Py_INCREF(self);
diff -u -r Python-2.5/Modules/_ctypes/_ctypes_test.c lang/python/src/Modules/_ctypes/_ctypes_test.c
--- Python-2.5/Modules/_ctypes/_ctypes_test.c	2006-08-14 08:13:05.000000000 +0100
+++ lang/python/src/Modules/_ctypes/_ctypes_test.c	2007-02-15 23:16:24.000000000 +0000
@@ -302,7 +302,7 @@
 {
 }
 
-PyObject *py_func(PyObject *self, PyObject *args)
+PyObject *py_func(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_INCREF(Py_None);
 	return Py_None;
diff -u -r Python-2.5/Modules/_curses_panel.c lang/python/src/Modules/_curses_panel.c
--- Python-2.5/Modules/_curses_panel.c	2006-03-07 13:38:14.000000000 +0000
+++ lang/python/src/Modules/_curses_panel.c	2007-02-15 23:08:30.000000000 +0000
@@ -143,11 +143,11 @@
    PARSESTR - format string for argument parsing */
 
 #define Panel_NoArgNoReturnFunction(X) \
-static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self) \
+static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *NOARGS_NULL) \
 { return PyCursesCheckERR(X(self->pan), # X); }
 
 #define Panel_NoArgTrueFalseFunction(X) \
-static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self) \
+static PyObject *PyCursesPanel_##X(PyCursesPanelObject *self, PyObject *NOARGS_NULL) \
 { \
   if (X (self->pan) == FALSE) { Py_INCREF(Py_False); return Py_False; } \
   else { Py_INCREF(Py_True); return Py_True; } }
@@ -199,7 +199,7 @@
 /* panel_above(NULL) returns the bottom panel in the stack. To get
    this behaviour we use curses.panel.bottom_panel(). */
 static PyObject *
-PyCursesPanel_above(PyCursesPanelObject *self)
+PyCursesPanel_above(PyCursesPanelObject *self, PyObject *NOARGS_NULL)
 {
     PANEL *pan;
     PyCursesPanelObject *po;
@@ -224,7 +224,7 @@
 /* panel_below(NULL) returns the top panel in the stack. To get
    this behaviour we use curses.panel.top_panel(). */
 static PyObject *
-PyCursesPanel_below(PyCursesPanelObject *self)
+PyCursesPanel_below(PyCursesPanelObject *self, PyObject *NOARGS_NULL)
 {
     PANEL *pan;
     PyCursesPanelObject *po;
@@ -247,7 +247,7 @@
 }
 
 static PyObject *
-PyCursesPanel_window(PyCursesPanelObject *self)
+PyCursesPanel_window(PyCursesPanelObject *self, PyObject *NOARGS_NULL)
 {
     Py_INCREF(self->wo);
     return (PyObject *)self->wo;
@@ -296,7 +296,7 @@
 }
 
 static PyObject *
-PyCursesPanel_userptr(PyCursesPanelObject *self)
+PyCursesPanel_userptr(PyCursesPanelObject *self, PyObject *NOARGS_NULL)
 {
     PyObject *obj;
     PyCursesInitialised; 
@@ -361,7 +361,7 @@
    panel.above() *requires* a panel object in the first place which
    may be undesirable. */
 static PyObject *
-PyCurses_bottom_panel(PyObject *self)
+PyCurses_bottom_panel(PyObject *self, PyObject *NOARGS_NULL)
 {
     PANEL *pan;
     PyCursesPanelObject *po;
@@ -407,7 +407,7 @@
    *requires* a panel object in the first place which may be
    undesirable. */
 static PyObject *
-PyCurses_top_panel(PyObject *self)
+PyCurses_top_panel(PyObject *self, PyObject *NOARGS_NULL)
 {
     PANEL *pan;
     PyCursesPanelObject *po;
@@ -431,7 +431,7 @@
     return (PyObject *)po;
 }
 
-static PyObject *PyCurses_update_panels(PyObject *self)
+static PyObject *PyCurses_update_panels(PyObject *self, PyObject *NOARGS_NULL)
 { 
     PyCursesInitialised;
     update_panels();
diff -u -r Python-2.5/Modules/_cursesmodule.c lang/python/src/Modules/_cursesmodule.c
--- Python-2.5/Modules/_cursesmodule.c	2006-09-05 03:33:44.000000000 +0100
+++ lang/python/src/Modules/_cursesmodule.c	2007-02-15 23:23:46.000000000 +0000
@@ -242,22 +242,22 @@
    */
 
 #define Window_NoArgNoReturnFunction(X) \
-static PyObject *PyCursesWindow_ ## X (PyCursesWindowObject *self, PyObject *args) \
+static PyObject *PyCursesWindow_ ## X (PyCursesWindowObject *self, PyObject *NOARGS_NULL) \
 { return PyCursesCheckERR(X(self->win), # X); }
 
 #define Window_NoArgTrueFalseFunction(X) \
-static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self) \
+static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self, PyObject *NOARGS_NULL) \
 { \
   if (X (self->win) == FALSE) { Py_INCREF(Py_False); return Py_False; } \
   else { Py_INCREF(Py_True); return Py_True; } }
 
 #define Window_NoArgNoReturnVoidFunction(X) \
-static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self) \
+static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self, PyObject *NOARGS_NULL) \
 { \
   X(self->win); Py_INCREF(Py_None); return Py_None; }
 
 #define Window_NoArg2TupleReturnFunction(X, TYPE, ERGSTR) \
-static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self) \
+static PyObject * PyCursesWindow_ ## X (PyCursesWindowObject *self, PyObject *NOARGS_NULL) \
 { \
   TYPE arg1, arg2; \
   X(self->win,arg1,arg2); return Py_BuildValue(ERGSTR, arg1, arg2); } 
@@ -727,7 +727,7 @@
 #endif
 
 static PyObject *
-PyCursesWindow_GetBkgd(PyCursesWindowObject *self)
+PyCursesWindow_GetBkgd(PyCursesWindowObject *self, PyObject *NOARGS_NULL)
 {
   return PyInt_FromLong((long) getbkgd(self->win));
 }
@@ -1628,7 +1628,7 @@
 }
 
 static PyObject *
-PyCurses_EraseChar(PyObject *self)
+PyCurses_EraseChar(PyObject *self, PyObject *NOARGS_NULL)
 {
   char ch;
 
@@ -1640,7 +1640,7 @@
 }
 
 static PyObject *
-PyCurses_getsyx(PyObject *self)
+PyCurses_getsyx(PyObject *self, PyObject *NOARGS_NULL)
 {
   int x,y;
 
@@ -1653,7 +1653,7 @@
 
 #ifdef NCURSES_MOUSE_VERSION
 static PyObject *
-PyCurses_GetMouse(PyObject *self)
+PyCurses_GetMouse(PyObject *self, PyObject *NOARGS_NULL)
 {
 	int rtn;
 	MEVENT event;
@@ -1781,7 +1781,7 @@
 static PyObject *ModDict;
 
 static PyObject * 
-PyCurses_InitScr(PyObject *self)
+PyCurses_InitScr(PyObject *self, PyObject *NOARGS_NULL)
 {
   WINDOW *win;
 
@@ -1998,7 +1998,7 @@
 #endif
 
 static PyObject *  
-PyCurses_KillChar(PyObject *self)  
+PyCurses_KillChar(PyObject *self, PyObject *NOARGS_NULL)
 {  
   char ch;  
 
@@ -2250,7 +2250,7 @@
 }
 
 static PyObject *
-PyCurses_Start_Color(PyObject *self)
+PyCurses_Start_Color(PyObject *self, PyObject *NOARGS_NULL)
 {
   int code;
   PyObject *c, *cp;
@@ -2421,7 +2421,7 @@
 
 #ifndef STRICT_SYSV_CURSES
 static PyObject *
-PyCurses_Use_Default_Colors(PyObject *self)
+PyCurses_Use_Default_Colors(PyObject *self, PyObject *NOARGS_NULL)
 {
   int code;
 
diff -u -r Python-2.5/Modules/_functoolsmodule.c lang/python/src/Modules/_functoolsmodule.c
--- Python-2.5/Modules/_functoolsmodule.c	2006-05-29 13:43:05.000000000 +0100
+++ lang/python/src/Modules/_functoolsmodule.c	2007-02-16 11:37:18.927996392 +0000
@@ -156,7 +156,7 @@
 };
 
 static PyObject *
-partial_get_dict(partialobject *pto)
+partial_get_dict(partialobject *pto, void *closure)
 {
 	if (pto->dict == NULL) {
 		pto->dict = PyDict_New();
@@ -168,7 +168,7 @@
 }
 
 static int
-partial_set_dict(partialobject *pto, PyObject *value)
+partial_set_dict(partialobject *pto, PyObject *value, void *closure)
 {
 	PyObject *tmp;
 
diff -u -r Python-2.5/Modules/_hashopenssl.c lang/python/src/Modules/_hashopenssl.c
--- Python-2.5/Modules/_hashopenssl.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/_hashopenssl.c	2007-02-16 11:21:14.136666968 +0000
@@ -77,7 +77,7 @@
 PyDoc_STRVAR(EVP_copy__doc__, "Return a copy of the hash object.");
 
 static PyObject *
-EVP_copy(EVPobject *self, PyObject *unused)
+EVP_copy(EVPobject *self, PyObject *NOARGS_NULL)
 {
     EVPobject *newobj;
 
@@ -92,7 +92,7 @@
 "Return the digest value as a string of binary data.");
 
 static PyObject *
-EVP_digest(EVPobject *self, PyObject *unused)
+EVP_digest(EVPobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[EVP_MAX_MD_SIZE];
     EVP_MD_CTX temp_ctx;
@@ -112,7 +112,7 @@
 "Return the digest value as a string of hexadecimal digits.");
 
 static PyObject *
-EVP_hexdigest(EVPobject *self, PyObject *unused)
+EVP_hexdigest(EVPobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[EVP_MAX_MD_SIZE];
     EVP_MD_CTX temp_ctx;
diff -u -r Python-2.5/Modules/_hotshot.c lang/python/src/Modules/_hotshot.c
--- Python-2.5/Modules/_hotshot.c	2006-08-12 02:43:40.000000000 +0100
+++ lang/python/src/Modules/_hotshot.c	2007-02-15 23:14:54.000000000 +0000
@@ -114,7 +114,7 @@
 "Close the log file, preventing additional records from being read.");
 
 static PyObject *
-logreader_close(LogReaderObject *self, PyObject *args)
+logreader_close(LogReaderObject *self, PyObject *NOARGS_NULL)
 {
     if (self->logfp != NULL) {
         fclose(self->logfp);
@@ -131,7 +131,7 @@
 "Raises ValueError if the log file is closed.");
 
 static PyObject *
-logreader_fileno(LogReaderObject *self)
+logreader_fileno(LogReaderObject *self, PyObject *NOARGS_NULL)
 {
     if (self->logfp == NULL) {
         PyErr_SetString(PyExc_ValueError,
@@ -1031,7 +1031,7 @@
 "Shut down this profiler and close the log files, even if its active.");
 
 static PyObject *
-profiler_close(ProfilerObject *self)
+profiler_close(ProfilerObject *self, PyObject *NOARGS_NULL)
 {
     do_stop(self);
     if (self->logfp != NULL) {
@@ -1045,7 +1045,7 @@
 #define fileno__doc__ logreader_fileno__doc__
 
 static PyObject *
-profiler_fileno(ProfilerObject *self)
+profiler_fileno(ProfilerObject *self, PyObject *NOARGS_NULL)
 {
     if (self->logfp == NULL) {
         PyErr_SetString(PyExc_ValueError,
@@ -1122,7 +1122,7 @@
 "Install this profiler for the current thread.");
 
 static PyObject *
-profiler_start(ProfilerObject *self, PyObject *args)
+profiler_start(ProfilerObject *self, PyObject *NOARGS_NULL)
 {
     PyObject *result = NULL;
 
@@ -1139,7 +1139,7 @@
 "Remove this profiler from the current thread.");
 
 static PyObject *
-profiler_stop(ProfilerObject *self, PyObject *args)
+profiler_stop(ProfilerObject *self, PyObject *NOARGS_NULL)
 {
     PyObject *result = NULL;
 
@@ -1584,7 +1584,7 @@
 ;
 
 static PyObject *
-hotshot_resolution(PyObject *self, PyObject *unused)
+hotshot_resolution(PyObject *self, PyObject *NOARGS_NULL)
 {
     if (timeofday_diff == 0) {
         calibrate();
diff -u -r Python-2.5/Modules/_localemodule.c lang/python/src/Modules/_localemodule.c
--- Python-2.5/Modules/_localemodule.c	2006-06-10 13:23:46.000000000 +0100
+++ lang/python/src/Modules/_localemodule.c	2007-02-15 23:08:45.000000000 +0000
@@ -199,7 +199,7 @@
 "() -> dict. Returns numeric and monetary locale-specific parameters.");
 
 static PyObject*
-PyLocale_localeconv(PyObject* self)
+PyLocale_localeconv(PyObject* self, PyObject *NOARGS_NULL)
 {
     PyObject* result;
     struct lconv *l;
@@ -375,7 +375,7 @@
 
 #if defined(MS_WINDOWS)
 static PyObject*
-PyLocale_getdefaultlocale(PyObject* self)
+PyLocale_getdefaultlocale(PyObject* self, PyObject *NOARGS_NULL)
 {
     char encoding[100];
     char locale[100];
diff -u -r Python-2.5/Modules/_lsprof.c lang/python/src/Modules/_lsprof.c
--- Python-2.5/Modules/_lsprof.c	2006-04-16 19:55:50.000000000 +0100
+++ lang/python/src/Modules/_lsprof.c	2007-02-15 23:42:18.000000000 +0000
@@ -612,7 +612,7 @@
 ");
 
 static PyObject*
-profiler_getstats(ProfilerObject *pObj, PyObject* noarg)
+profiler_getstats(ProfilerObject *pObj, PyObject *NOARGS_NULL)
 {
 	statscollector_t collect;
 	if (pending_exception(pObj))
@@ -711,7 +711,7 @@
 ");
 
 static PyObject*
-profiler_disable(ProfilerObject *self, PyObject* noarg)
+profiler_disable(ProfilerObject *self, PyObject *NOARGS_NULL)
 {
 	self->flags &= ~POF_ENABLED;
 	PyEval_SetProfile(NULL, NULL);
@@ -729,7 +729,7 @@
 ");
 
 static PyObject*
-profiler_clear(ProfilerObject *pObj, PyObject* noarg)
+profiler_clear(ProfilerObject *pObj, PyObject *NOARGS_NULL)
 {
 	clearEntries(pObj);
 	Py_INCREF(Py_None);
diff -u -r Python-2.5/Modules/_sqlite/cache.c lang/python/src/Modules/_sqlite/cache.c
--- Python-2.5/Modules/_sqlite/cache.c	2006-04-23 16:24:26.000000000 +0100
+++ lang/python/src/Modules/_sqlite/cache.c	2007-02-15 23:29:05.000000000 +0000
@@ -211,7 +211,7 @@
     return node->data;
 }
 
-PyObject* cache_display(Cache* self, PyObject* args)
+PyObject* cache_display(Cache* self, PyObject *NOARGS_NULL)
 {
     Node* ptr;
     PyObject* prevkey;
diff -u -r Python-2.5/Modules/_sqlite/connection.c lang/python/src/Modules/_sqlite/connection.c
--- Python-2.5/Modules/_sqlite/connection.c	2006-06-19 22:17:35.000000000 +0100
+++ lang/python/src/Modules/_sqlite/connection.c	2007-02-15 23:29:31.000000000 +0000
@@ -239,7 +239,7 @@
     return cursor;
 }
 
-PyObject* connection_close(Connection* self, PyObject* args)
+PyObject* connection_close(Connection* self, PyObject *NOARGS_NULL)
 {
     int rc;
 
@@ -320,7 +320,7 @@
     }
 }
 
-PyObject* connection_commit(Connection* self, PyObject* args)
+PyObject* connection_commit(Connection* self, PyObject *NOARGS_NULL)
 {
     int rc;
     const char* tail;
@@ -364,7 +364,7 @@
     }
 }
 
-PyObject* connection_rollback(Connection* self, PyObject* args)
+PyObject* connection_rollback(Connection* self, PyObject *NOARGS_NULL)
 {
     int rc;
     const char* tail;
@@ -1063,7 +1063,7 @@
 }
 
 static PyObject *
-connection_interrupt(Connection* self, PyObject* args)
+connection_interrupt(Connection* self, PyObject *NOARGS_NULL)
 {
     PyObject* retval = NULL;
 
diff -u -r Python-2.5/Modules/_sqlite/cursor.c lang/python/src/Modules/_sqlite/cursor.c
--- Python-2.5/Modules/_sqlite/cursor.c	2006-07-28 19:36:01.000000000 +0100
+++ lang/python/src/Modules/_sqlite/cursor.c	2007-02-15 23:29:00.000000000 +0000
@@ -865,7 +865,7 @@
     return next_row;
 }
 
-PyObject* cursor_fetchone(Cursor* self, PyObject* args)
+PyObject* cursor_fetchone(Cursor* self, PyObject *NOARGS_NULL)
 {
     PyObject* row;
 
@@ -919,7 +919,7 @@
     }
 }
 
-PyObject* cursor_fetchall(Cursor* self, PyObject* args)
+PyObject* cursor_fetchall(Cursor* self, PyObject *NOARGS_NULL)
 {
     PyObject* row;
     PyObject* list;
@@ -955,7 +955,7 @@
     return Py_None;
 }
 
-PyObject* cursor_close(Cursor* self, PyObject* args)
+PyObject* cursor_close(Cursor* self, PyObject *NOARGS_NULL)
 {
     if (!check_thread(self->connection) || !check_connection(self->connection)) {
         return NULL;
diff -u -r Python-2.5/Modules/_ssl.c lang/python/src/Modules/_ssl.c
--- Python-2.5/Modules/_ssl.c	2006-07-11 03:04:09.000000000 +0100
+++ lang/python/src/Modules/_ssl.c	2007-02-15 23:19:38.000000000 +0000
@@ -333,13 +333,13 @@
 /* SSL object methods */
 
 static PyObject *
-PySSL_server(PySSLObject *self)
+PySSL_server(PySSLObject *self, PyObject *NOARGS_NULL)
 {
 	return PyString_FromString(self->server);
 }
 
 static PyObject *
-PySSL_issuer(PySSLObject *self)
+PySSL_issuer(PySSLObject *self, PyObject *NOARGS_NULL)
 {
 	return PyString_FromString(self->issuer);
 }
@@ -612,7 +612,7 @@
 bound on the entropy contained in string.");
 
 static PyObject *
-PySSL_RAND_status(PyObject *self)
+PySSL_RAND_status(PyObject *self, PyObject *NOARGS_NULL)
 {
     return PyInt_FromLong(RAND_status());
 }
diff -u -r Python-2.5/Modules/_testcapimodule.c lang/python/src/Modules/_testcapimodule.c
--- Python-2.5/Modules/_testcapimodule.c	2006-08-04 19:03:37.000000000 +0100
+++ lang/python/src/Modules/_testcapimodule.c	2007-02-15 23:32:51.000000000 +0000
@@ -47,7 +47,7 @@
 }
 
 static PyObject*
-test_config(PyObject *self)
+test_config(PyObject *self, PyObject *NOARGS_NULL)
 {
 #define CHECK_SIZEOF(FATNAME, TYPE) \
 	    if (FATNAME != sizeof(TYPE)) \
@@ -69,7 +69,7 @@
 }
 
 static PyObject*
-test_list_api(PyObject *self)
+test_list_api(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject* list;
 	int i;
@@ -156,7 +156,7 @@
 }
 
 static PyObject*
-test_dict_iteration(PyObject* self)
+test_dict_iteration(PyObject* self, PyObject *NOARGS_NULL)
 {
 	int i;
 
@@ -204,7 +204,7 @@
 #include "testcapi_long.h"
 
 static PyObject *
-test_long_api(PyObject* self)
+test_long_api(PyObject* self, PyObject *NOARGS_NULL)
 {
 	return TESTNAME(raise_test_long_error);
 }
@@ -234,7 +234,7 @@
 #include "testcapi_long.h"
 
 static PyObject *
-test_longlong_api(PyObject* self, PyObject *args)
+test_longlong_api(PyObject* self, PyObject *NOARGS_NULL)
 {
 	return TESTNAME(raise_test_longlong_error);
 }
@@ -251,7 +251,7 @@
    it fails.
 */
 static PyObject *
-test_L_code(PyObject *self)
+test_L_code(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *tuple, *num;
 	PY_LONG_LONG value;
@@ -402,7 +402,7 @@
 /* This function not only tests the 'k' getargs code, but also the
    PyInt_AsUnsignedLongMask() and PyInt_AsUnsignedLongMask() functions. */
 static PyObject *
-test_k_code(PyObject *self)
+test_k_code(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *tuple, *num;
 	unsigned long value;
@@ -460,7 +460,7 @@
    of an error.
 */
 static PyObject *
-test_u_code(PyObject *self)
+test_u_code(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *tuple, *obj;
 	Py_UNICODE *value;
@@ -520,7 +520,7 @@
 
 /* Simple test of _PyLong_NumBits and _PyLong_Sign. */
 static PyObject *
-test_long_numbits(PyObject *self)
+test_long_numbits(PyObject *self, PyObject *NOARGS_NULL)
 {
 	struct triple {
 		long input;
@@ -563,7 +563,7 @@
 /* Example passing NULLs to PyObject_Str(NULL) and PyObject_Unicode(NULL). */
 
 static PyObject *
-test_null_strings(PyObject *self)
+test_null_strings(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Unicode(NULL);
 	PyObject *tuple = PyTuple_Pack(2, o1, o2);
@@ -672,7 +672,7 @@
 
 /* Some tests of PyString_FromFormat().  This needs more tests. */
 static PyObject *
-test_string_from_format(PyObject *self, PyObject *args)
+test_string_from_format(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *result;
 	char *msg;
@@ -708,7 +708,7 @@
 
 /* This is here to provide a docstring for test_descr. */
 static PyObject *
-test_with_docstring(PyObject *self)
+test_with_docstring(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_RETURN_NONE;
 }
diff -u -r Python-2.5/Modules/_tkinter.c lang/python/src/Modules/_tkinter.c
--- Python-2.5/Modules/_tkinter.c	2006-08-12 03:33:36.000000000 +0100
+++ lang/python/src/Modules/_tkinter.c	2007-02-16 11:22:13.254679664 +0000
@@ -766,7 +766,7 @@
 "the string representation of this object, either as string or Unicode");
 
 static PyObject *
-PyTclObject_string(PyTclObject *self, void *ignored)
+PyTclObject_string(PyTclObject *self, void *closure)
 {
 	char *s;
 	int i, len;
@@ -800,7 +800,7 @@
 PyDoc_STRVAR(PyTclObject_unicode__doc__, "convert argument to unicode");
 
 static PyObject *
-PyTclObject_unicode(PyTclObject *self, void *ignored)
+PyTclObject_unicode(PyTclObject *self, PyObject *NOARGS_NULL)
 {
 	char *s;
 	int len;
@@ -837,7 +837,7 @@
 PyDoc_STRVAR(get_typename__doc__, "name of the Tcl type");
 
 static PyObject*
-get_typename(PyTclObject* obj, void* ignored)
+get_typename(PyTclObject* obj, void *closure)
 {
 	return PyString_FromString(obj->value->typePtr->name);
 }
@@ -2620,7 +2620,7 @@
 }
 
 static PyObject	*
-Tkapp_TkInit(PyObject *self, PyObject *args)
+Tkapp_TkInit(PyObject *self, PyObject *NOARGS_NULL)
 {
 	static int has_failed;
 	Tcl_Interp *interp = Tkapp_Interp(self);
@@ -2682,7 +2682,7 @@
 }
 
 static PyObject *
-Tkapp_WillDispatch(PyObject *self, PyObject *args)
+Tkapp_WillDispatch(PyObject *self, PyObject *NOARGS_NULL)
 {
 
 	((TkappObject*)self)->dispatching = 1;
@@ -2944,7 +2944,7 @@
 frames in an animation.";
 
 static PyObject *
-Tkinter_getbusywaitinterval(PyObject *self, PyObject *args)
+Tkinter_getbusywaitinterval(PyObject *self, PyObject *NOARGS_NULL)
 {
         return PyInt_FromLong(Tkinter_busywaitinterval);
 }
diff -u -r Python-2.5/Modules/bsddbmodule.c lang/python/src/Modules/bsddbmodule.c
--- Python-2.5/Modules/bsddbmodule.c	2006-02-15 17:27:45.000000000 +0000
+++ lang/python/src/Modules/bsddbmodule.c	2007-02-15 23:37:44.000000000 +0000
@@ -380,7 +380,7 @@
 };
 
 static PyObject *
-bsddb_close(bsddbobject *dp)
+bsddb_close(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	if (dp->di_bsddb != NULL) {
 		int status;
@@ -399,7 +399,7 @@
 }
 
 static PyObject *
-bsddb_keys(bsddbobject *dp)
+bsddb_keys(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	PyObject *list, *item=NULL;
 	DBT krec, drec;
@@ -603,27 +603,27 @@
 }
 
 static PyObject *
-bsddb_next(bsddbobject *dp)
+bsddb_next(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	return bsddb_seq(dp, R_NEXT);
 }
 static PyObject *
-bsddb_previous(bsddbobject *dp)
+bsddb_previous(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	return bsddb_seq(dp, R_PREV);
 }
 static PyObject *
-bsddb_first(bsddbobject *dp)
+bsddb_first(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	return bsddb_seq(dp, R_FIRST);
 }
 static PyObject *
-bsddb_last(bsddbobject *dp)
+bsddb_last(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	return bsddb_seq(dp, R_LAST);
 }
 static PyObject *
-bsddb_sync(bsddbobject *dp)
+bsddb_sync(bsddbobject *dp, PyObject *NOARGS_NULL)
 {
 	int status;
 
diff -u -r Python-2.5/Modules/bz2module.c lang/python/src/Modules/bz2module.c
--- Python-2.5/Modules/bz2module.c	2006-08-14 22:42:55.000000000 +0100
+++ lang/python/src/Modules/bz2module.c	2007-02-15 23:17:25.000000000 +0000
@@ -1135,7 +1135,7 @@
 ");
 
 static PyObject *
-BZ2File_tell(BZ2FileObject *self, PyObject *args)
+BZ2File_tell(BZ2FileObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *ret = NULL;
 
@@ -1164,7 +1164,7 @@
 ");
 
 static PyObject *
-BZ2File_close(BZ2FileObject *self)
+BZ2File_close(BZ2FileObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *ret = NULL;
 	int bzerror = BZ_OK;
@@ -1612,7 +1612,7 @@
 ");
 
 static PyObject *
-BZ2Comp_flush(BZ2CompObject *self)
+BZ2Comp_flush(BZ2CompObject *self, PyObject *NOARGS_NULL)
 {
 	int bufsize = SMALLCHUNK;
 	PyObject *ret = NULL;
diff -u -r Python-2.5/Modules/cjkcodecs/multibytecodec.c lang/python/src/Modules/cjkcodecs/multibytecodec.c
--- Python-2.5/Modules/cjkcodecs/multibytecodec.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/cjkcodecs/multibytecodec.c	2007-02-15 23:36:51.000000000 +0000
@@ -867,7 +867,7 @@
 }
 
 static PyObject *
-mbiencoder_reset(MultibyteIncrementalEncoderObject *self)
+mbiencoder_reset(MultibyteIncrementalEncoderObject *self, PyObject *NOARGS_NULL)
 {
 	if (self->codec->decreset != NULL &&
 	    self->codec->decreset(&self->state, self->codec->config) != 0)
@@ -1068,7 +1068,7 @@
 }
 
 static PyObject *
-mbidecoder_reset(MultibyteIncrementalDecoderObject *self)
+mbidecoder_reset(MultibyteIncrementalDecoderObject *self, PyObject *NOARGS_NULL)
 {
 	if (self->codec->decreset != NULL &&
 	    self->codec->decreset(&self->state, self->codec->config) != 0)
@@ -1366,7 +1366,7 @@
 }
 
 static PyObject *
-mbstreamreader_reset(MultibyteStreamReaderObject *self)
+mbstreamreader_reset(MultibyteStreamReaderObject *self, PyObject *NOARGS_NULL)
 {
 	if (self->codec->decreset != NULL &&
 	    self->codec->decreset(&self->state, self->codec->config) != 0)
@@ -1568,7 +1568,7 @@
 }
 
 static PyObject *
-mbstreamwriter_reset(MultibyteStreamWriterObject *self)
+mbstreamwriter_reset(MultibyteStreamWriterObject *self, PyObject *NOARGS_NULL)
 {
 	const Py_UNICODE *pending;
 	PyObject *pwrt;
diff -u -r Python-2.5/Modules/clmodule.c lang/python/src/Modules/clmodule.c
--- Python-2.5/Modules/clmodule.c	2006-01-19 06:09:39.000000000 +0000
+++ lang/python/src/Modules/clmodule.c	2007-02-15 23:18:02.000000000 +0000
@@ -205,13 +205,13 @@
 }
 
 static PyObject *
-clm_CloseCompressor(PyObject *self)
+clm_CloseCompressor(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return doClose(SELF, clCloseCompressor);
 }
 
 static PyObject *
-clm_CloseDecompressor(PyObject *self)
+clm_CloseDecompressor(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return doClose(SELF, clCloseDecompressor);
 }
@@ -475,7 +475,7 @@
 }
 
 static PyObject *
-clm_QueryParams(PyObject *self)
+clm_QueryParams(PyObject *self, PyObject *NOARGS_NULL)
 {
 	int bufferlength;
 	int *PVbuffer;
@@ -567,7 +567,7 @@
 }
 
 static PyObject *
-clm_QuerySchemeFromHandle(PyObject *self)
+clm_QuerySchemeFromHandle(PyObject *self, PyObject *NOARGS_NULL)
 {
 	CheckCompressor(SELF);
 	return PyInt_FromLong(clQuerySchemeFromHandle(SELF->ob_compressorHdl));
diff -u -r Python-2.5/Modules/dbmmodule.c lang/python/src/Modules/dbmmodule.c
--- Python-2.5/Modules/dbmmodule.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/dbmmodule.c	2007-02-15 23:31:19.000000000 +0000
@@ -168,7 +168,7 @@
 };
 
 static PyObject *
-dbm__close(register dbmobject *dp, PyObject *unused)
+dbm__close(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
         if (dp->di_dbm)
 		dbm_close(dp->di_dbm);
@@ -178,7 +178,7 @@
 }
 
 static PyObject *
-dbm_keys(register dbmobject *dp, PyObject *unused)
+dbm_keys(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
 	register PyObject *v, *item;
 	datum key;
diff -u -r Python-2.5/Modules/dlmodule.c lang/python/src/Modules/dlmodule.c
--- Python-2.5/Modules/dlmodule.c	2006-07-10 02:18:57.000000000 +0100
+++ lang/python/src/Modules/dlmodule.c	2007-02-15 23:31:49.000000000 +0000
@@ -43,7 +43,7 @@
 }
 
 static PyObject *
-dl_close(dlobject *xp)
+dl_close(dlobject *xp, PyObject *NOARGS_NULL)
 {
 	if (xp->dl_handle != NULL) {
 		dlclose(xp->dl_handle);
diff -u -r Python-2.5/Modules/flmodule.c lang/python/src/Modules/flmodule.c
--- Python-2.5/Modules/flmodule.c	2006-05-29 22:58:42.000000000 +0100
+++ lang/python/src/Modules/flmodule.c	2007-02-15 23:13:45.000000000 +0000
@@ -178,7 +178,7 @@
 }
 
 static PyObject *
-generic_delete_object(genericobject *g)
+generic_delete_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	PyObject *res;
 	res = generic_call(g, fl_delete_object);
@@ -188,19 +188,19 @@
 }
 
 static PyObject *
-generic_show_object(genericobject *g)
+generic_show_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_show_object);
 }
 
 static PyObject *
-generic_hide_object(genericobject *g)
+generic_hide_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_hide_object);
 }
 
 static PyObject *
-generic_redraw_object(genericobject *g)
+generic_redraw_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_redraw_object);
 }
@@ -212,13 +212,13 @@
     using, we omit them unconditionally. */
  
 static PyObject *
-generic_freeze_object(genericobject *g)
+generic_freeze_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_freeze_object);
 }
 
 static PyObject *
-generic_unfreeze_object(genericobject *g)
+generic_unfreeze_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_unfreeze_object);
 }
@@ -226,19 +226,19 @@
 #endif /* OBSOLETE_FORMS_CALLS */
 
 static PyObject *
-generic_activate_object(genericobject *g)
+generic_activate_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_activate_object);
 }
 
 static PyObject *
-generic_deactivate_object(genericobject *g)
+generic_deactivate_object(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call(g, fl_deactivate_object);
 }
 
 static PyObject *
-generic_set_object_shortcut(genericobject *g, PyObject *args)
+generic_set_object_shortcut(genericobject *g, PyObject *NOARGS_NULL)
 {
 	char *str;
 	if (!PyArg_ParseTuple(args, "s:set_object_shortcut", &str))
@@ -576,7 +576,7 @@
 }
 
 static PyObject *
-clear_browser(genericobject *g)
+clear_browser(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call (g, fl_clear_browser);
 }
@@ -640,7 +640,7 @@
 }
 
 static PyObject *
-get_browser_maxline(genericobject *g)
+get_browser_maxline(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Ri (fl_get_browser_maxline, g-> ob_generic);
 }
@@ -658,7 +658,7 @@
 }
 
 static PyObject *
-deselect_browser (genericobject *g)
+deselect_browser(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call (g, fl_deselect_browser);
 }
@@ -677,7 +677,7 @@
 }
 
 static PyObject *
-get_browser (genericobject *g)
+get_browser(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Ri (fl_get_browser, g-> ob_generic);
 }
@@ -749,13 +749,13 @@
 }
 
 static PyObject *
-get_button(genericobject *g)
+get_button(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Ri (fl_get_button, g-> ob_generic);
 }
 
 static PyObject *
-get_button_numb(genericobject *g)
+get_button_numb(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Ri (fl_get_button_numb, g-> ob_generic);
 }
@@ -783,13 +783,13 @@
 }
 
 static PyObject *
-get_choice(genericobject *g)
+get_choice(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Ri (fl_get_choice, g-> ob_generic);
 }
 
 static PyObject *
-clear_choice (genericobject *g)
+clear_choice(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return generic_call (g, fl_clear_choice);
 }
@@ -813,7 +813,7 @@
 }
 
 static PyObject *
-get_choice_text (genericobject *g)
+get_choice_text(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rstr (fl_get_choice_text, g-> ob_generic);
 }
@@ -846,7 +846,7 @@
 /* Class : Clock */
 
 static PyObject *
-get_clock(genericobject *g)
+get_clock(genericobject *g, PyObject *NOARGS_NULL)
 {
 	int i0, i1, i2;
 
@@ -863,7 +863,7 @@
 /* CLass : Counters */
 
 static PyObject *
-get_counter_value(genericobject *g)
+get_counter_value(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_counter_value, g-> ob_generic);
 }
@@ -918,7 +918,7 @@
 /* Class: Dials */
 
 static PyObject *
-get_dial_value(genericobject *g)
+get_dial_value(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_dial_value, g-> ob_generic);
 }
@@ -936,7 +936,7 @@
 }
 
 static PyObject *
-get_dial_bounds (genericobject *g)
+get_dial_bounds(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_OUTfOUTf (fl_get_dial_bounds, g-> ob_generic);
 }
@@ -965,7 +965,7 @@
 }
 
 static PyObject *
-get_input (genericobject *g)
+get_input(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rstr (fl_get_input, g-> ob_generic);
 }
@@ -1000,7 +1000,7 @@
 }
 
 static PyObject *
-get_menu (genericobject *g)
+get_menu(genericobject *g, PyObject *NOARGS_NULL)
 {
 	/* XXX strictly speaking this is wrong since fl_get_menu
 	   XXX returns long, not int */
@@ -1008,7 +1008,7 @@
 }
 
 static PyObject *
-get_menu_text (genericobject *g)
+get_menu_text(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rstr (fl_get_menu_text, g-> ob_generic);
 }
@@ -1031,7 +1031,7 @@
 /* Class: Sliders */
 
 static PyObject *
-get_slider_value(genericobject *g)
+get_slider_value(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_slider_value, g-> ob_generic);
 }
@@ -1049,7 +1049,7 @@
 }
 
 static PyObject *
-get_slider_bounds (genericobject *g)
+get_slider_bounds(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_OUTfOUTf(fl_get_slider_bounds, g-> ob_generic);
 }
@@ -1118,25 +1118,25 @@
 }
 
 static PyObject *
-get_positioner_xvalue (genericobject *g)
+get_positioner_xvalue(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_positioner_xvalue, g-> ob_generic);
 }
 
 static PyObject *
-get_positioner_xbounds (genericobject *g)
+get_positioner_xbounds(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_OUTfOUTf (fl_get_positioner_xbounds, g-> ob_generic);
 }
 
 static PyObject *
-get_positioner_yvalue (genericobject *g)
+get_positioner_yvalue(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_positioner_yvalue, g-> ob_generic);
 }
 
 static PyObject *
-get_positioner_ybounds (genericobject *g)
+get_positioner_ybounds(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_OUTfOUTf (fl_get_positioner_ybounds, g-> ob_generic);
 }
@@ -1170,7 +1170,7 @@
 }
 
 static PyObject *
-get_timer (genericobject *g)
+get_timer(genericobject *g, PyObject *NOARGS_NULL)
 {
 	return call_forms_Rf (fl_get_timer, g-> ob_generic);
 }
@@ -1240,13 +1240,13 @@
 }
 
 static PyObject *
-form_hide_form(formobject *f)
+form_hide_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_hide_form, f-> ob_form);
 }
 
 static PyObject *
-form_redraw_form(formobject *f)
+form_redraw_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_redraw_form, f-> ob_form);
 }
@@ -1394,25 +1394,25 @@
 }
 
 static PyObject *
-form_freeze_form(formobject *f)
+form_freeze_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_freeze_form, f-> ob_form);
 }
 
 static PyObject *
-form_unfreeze_form(formobject *f)
+form_unfreeze_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_unfreeze_form, f-> ob_form);
 }
 
 static PyObject *
-form_activate_form(formobject *f)
+form_activate_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_activate_form, f-> ob_form);
 }
 
 static PyObject *
-form_deactivate_form(formobject *f)
+form_deactivate_form(formobject *f, PyObject *NOARGS_NULL)
 {
 	return form_call(fl_deactivate_form, f-> ob_form);
 }
@@ -1725,25 +1725,25 @@
 }
 
 static PyObject *
-forms_do_forms(PyObject *dummy)
+forms_do_forms(PyObject *dummy, PyObject *NOARGS_NULL)
 {
 	return forms_do_or_check_forms(dummy, fl_do_forms);
 }
 
 static PyObject *
-forms_check_forms(PyObject *dummy)
+forms_check_forms(PyObject *dummy, PyObject *NOARGS_NULL)
 {
 	return forms_do_or_check_forms(dummy, fl_check_forms);
 }
 
 static PyObject *
-forms_do_only_forms(PyObject *dummy)
+forms_do_only_forms(PyObject *dummy, PyObject *NOARGS_NULL)
 {
 	return forms_do_or_check_forms(dummy, fl_do_only_forms);
 }
 
 static PyObject *
-forms_check_only_forms(PyObject *dummy)
+forms_check_only_forms(PyObject *dummy, PyObject *NOARGS_NULL)
 {
 	return forms_do_or_check_forms(dummy, fl_check_only_forms);
 }
@@ -1861,7 +1861,7 @@
 }
 
 static PyObject *
-forms_qreset(PyObject *self)
+forms_qreset(PyObject *self, PyObject *NOARGS_NULL)
 {
 	fl_qreset();
 	Py_INCREF(Py_None);
@@ -1920,7 +1920,7 @@
 }
 
 static PyObject *
-forms_get_mouse(PyObject *self)
+forms_get_mouse(PyObject *self, PyObject *NOARGS_NULL)
 {
 	float x, y;
 
diff -u -r Python-2.5/Modules/fmmodule.c lang/python/src/Modules/fmmodule.c
--- Python-2.5/Modules/fmmodule.c	2006-05-29 14:53:16.000000000 +0100
+++ lang/python/src/Modules/fmmodule.c	2007-02-15 23:36:09.000000000 +0000
@@ -49,7 +49,7 @@
 /* XXX fmmakefont */
 
 static PyObject *
-fh_setfont(fhobject *self)
+fh_setfont(fhobject *self, PyObject *NOARGS_NULL)
 {
 	fmsetfont(self->fh_fh);
 	Py_INCREF(Py_None);
@@ -57,7 +57,7 @@
 }
 
 static PyObject *
-fh_getfontname(fhobject *self)
+fh_getfontname(fhobject *self, PyObject *NOARGS_NULL)
 {
 	char fontname[256];
 	int len;
@@ -70,7 +70,7 @@
 }
 
 static PyObject *
-fh_getcomment(fhobject *self)
+fh_getcomment(fhobject *self, PyObject *NOARGS_NULL)
 {
 	char comment[256];
 	int len;
@@ -83,7 +83,7 @@
 }
 
 static PyObject *
-fh_getfontinfo(fhobject *self)
+fh_getfontinfo(fhobject *self, PyObject *NOARGS_NULL)
 {
 	fmfontinfo info;
 	if (fmgetfontinfo(self->fh_fh, &info) < 0) {
@@ -162,7 +162,7 @@
 /* Font Manager functions */
 
 static PyObject *
-fm_init(PyObject *self)
+fm_init(PyObject *self, PyObject *NOARGS_NULL)
 {
 	fminit();
 	Py_INCREF(Py_None);
@@ -214,7 +214,7 @@
 }
 
 static PyObject *
-fm_enumerate(PyObject *self)
+fm_enumerate(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *res;
 	fontlist = PyList_New(0);
@@ -238,7 +238,7 @@
 }
 
 static PyObject *
-fm_fontpath(PyObject *self)
+fm_fontpath(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyString_FromString(fmfontpath());
 }
diff -u -r Python-2.5/Modules/gdbmmodule.c lang/python/src/Modules/gdbmmodule.c
--- Python-2.5/Modules/gdbmmodule.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/gdbmmodule.c	2007-02-15 23:43:11.000000000 +0000
@@ -189,7 +189,7 @@
 Closes the database.");
 
 static PyObject *
-dbm_close(register dbmobject *dp, PyObject *unused)
+dbm_close(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
     if (dp->di_dbm)
         gdbm_close(dp->di_dbm);
@@ -203,7 +203,7 @@
 Get a list of all keys in the database.");
 
 static PyObject *
-dbm_keys(register dbmobject *dp, PyObject *unused)
+dbm_keys(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
     register PyObject *v, *item;
     datum key, nextkey;
@@ -264,7 +264,7 @@
 returns the starting key.");
 
 static PyObject *
-dbm_firstkey(register dbmobject *dp, PyObject *unused)
+dbm_firstkey(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
     register PyObject *v;
     datum key;
@@ -323,7 +323,7 @@
 kept and reused as new (key,value) pairs are added.");
 
 static PyObject *
-dbm_reorganize(register dbmobject *dp, PyObject *unused)
+dbm_reorganize(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
     check_dbmobject_open(dp);
     errno = 0;
@@ -344,7 +344,7 @@
 any unwritten data to be written to the disk.");
 
 static PyObject *
-dbm_sync(register dbmobject *dp, PyObject *unused)
+dbm_sync(register dbmobject *dp, PyObject *NOARGS_NULL)
 {
     check_dbmobject_open(dp);
     gdbm_sync(dp->di_dbm);
diff -u -r Python-2.5/Modules/glmodule.c lang/python/src/Modules/glmodule.c
--- Python-2.5/Modules/glmodule.c	2002-07-28 16:23:23.000000000 +0100
+++ lang/python/src/Modules/glmodule.c	2007-02-15 23:17:06.000000000 +0000
@@ -485,7 +485,7 @@
 	return pick_select(args, pick);
 }
 
-static PyObject *gl_endpick(PyObject *self)
+static PyObject *gl_endpick(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return endpick_select(endpick);
 }
@@ -495,7 +495,7 @@
 	return pick_select(args, gselect);
 }
 
-static PyObject *gl_endselect(PyObject *self)
+static PyObject *gl_endselect(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return endpick_select(endselect);
 }
diff -u -r Python-2.5/Modules/grpmodule.c lang/python/src/Modules/grpmodule.c
--- Python-2.5/Modules/grpmodule.c	2006-05-25 23:00:14.000000000 +0100
+++ lang/python/src/Modules/grpmodule.c	2007-02-15 23:35:31.000000000 +0000
@@ -126,7 +126,7 @@
 }
 
 static PyObject *
-grp_getgrall(PyObject *self, PyObject *ignore)
+grp_getgrall(PyObject *self, PyObject *NOARGS_NULL)
 {
     PyObject *d;
     struct group *p;
diff -u -r Python-2.5/Modules/linuxaudiodev.c lang/python/src/Modules/linuxaudiodev.c
--- Python-2.5/Modules/linuxaudiodev.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/linuxaudiodev.c	2007-02-15 23:09:22.000000000 +0000
@@ -219,7 +219,7 @@
 }
 
 static PyObject *
-lad_close(lad_t *self, PyObject *unused)
+lad_close(lad_t *self, PyObject *NOARGS_NULL)
 {
     if (self->x_fd >= 0) {
         close(self->x_fd);
@@ -229,7 +229,7 @@
 }
 
 static PyObject *
-lad_fileno(lad_t *self, PyObject *unused)
+lad_fileno(lad_t *self, PyObject *NOARGS_NULL)
 {
     return PyInt_FromLong(self->x_fd);
 }
@@ -354,7 +354,7 @@
 /* obufcount returns the number of samples that are available in the 
    hardware for playing */
 static PyObject *
-lad_obufcount(lad_t *self, PyObject *unused)
+lad_obufcount(lad_t *self, PyObject *NOARGS_NULL)
 {
     audio_buf_info ai;
     int nchannels=0, ssize=0;
@@ -374,7 +374,7 @@
 /* obufcount returns the number of samples that can be played without
    blocking */
 static PyObject *
-lad_obuffree(lad_t *self, PyObject *unused)
+lad_obuffree(lad_t *self, PyObject *NOARGS_NULL)
 {
     audio_buf_info ai;
     int nchannels=0, ssize=0;
@@ -392,7 +392,7 @@
 
 /* Flush the device */
 static PyObject *
-lad_flush(lad_t *self, PyObject *unused)
+lad_flush(lad_t *self, PyObject *NOARGS_NULL)
 {
     if (ioctl(self->x_fd, SNDCTL_DSP_SYNC, NULL) == -1) {
         PyErr_SetFromErrno(LinuxAudioError);
@@ -402,7 +402,7 @@
 }
 
 static PyObject *
-lad_getptr(lad_t *self, PyObject *unused)
+lad_getptr(lad_t *self, PyObject *NOARGS_NULL)
 {
     count_info info;
     int req;
diff -u -r Python-2.5/Modules/md5module.c lang/python/src/Modules/md5module.c
--- Python-2.5/Modules/md5module.c	2006-04-03 17:27:50.000000000 +0100
+++ lang/python/src/Modules/md5module.c	2007-02-15 23:32:00.000000000 +0000
@@ -71,7 +71,7 @@
 
 
 static PyObject *
-md5_digest(md5object *self)
+md5_digest(md5object *self, PyObject *NOARGS_NULL)
 {
  	md5_state_t mdContext;
 	unsigned char aDigest[16];
@@ -92,7 +92,7 @@
 
 
 static PyObject *
-md5_hexdigest(md5object *self)
+md5_hexdigest(md5object *self, PyObject *NOARGS_NULL)
 {
  	md5_state_t mdContext;
 	unsigned char digest[16];
@@ -124,7 +124,7 @@
 
 
 static PyObject *
-md5_copy(md5object *self)
+md5_copy(md5object *self, PyObject *NOARGS_NULL)
 {
 	md5object *md5p;
 
diff -u -r Python-2.5/Modules/mmapmodule.c lang/python/src/Modules/mmapmodule.c
--- Python-2.5/Modules/mmapmodule.c	2006-08-22 14:57:07.000000000 +0100
+++ lang/python/src/Modules/mmapmodule.c	2007-02-15 23:40:00.000000000 +0000
@@ -117,7 +117,7 @@
 }
 
 static PyObject *
-mmap_close_method(mmap_object *self, PyObject *unused)
+mmap_close_method(mmap_object *self, PyObject *NOARGS_NULL)
 {
 #ifdef MS_WINDOWS
 	/* For each resource we maintain, we need to check
@@ -175,8 +175,7 @@
 #endif /* UNIX */
 
 static PyObject *
-mmap_read_byte_method(mmap_object *self,
-		      PyObject *unused)
+mmap_read_byte_method(mmap_object *self, PyObject *NOARGS_NULL)
 {
 	CHECK_VALID(NULL);
 	if (self->pos < self->size) {
@@ -190,8 +189,7 @@
 }
 
 static PyObject *
-mmap_read_line_method(mmap_object *self,
-		      PyObject *unused)
+mmap_read_line_method(mmap_object *self, PyObject *NOARGS_NULL)
 {
 	char *start = self->data+self->pos;
 	char *eof = self->data+self->size;
@@ -328,8 +326,7 @@
 }
 
 static PyObject *
-mmap_size_method(mmap_object *self,
-		 PyObject *unused)
+mmap_size_method(mmap_object *self, PyObject *NOARGS_NULL)
 {
 	CHECK_VALID(NULL);
 
@@ -467,7 +464,7 @@
 }
 
 static PyObject *
-mmap_tell_method(mmap_object *self, PyObject *unused)
+mmap_tell_method(mmap_object *self, PyObject *NOARGS_NULL)
 {
 	CHECK_VALID(NULL);
 	return PyInt_FromSize_t(self->pos);
diff -u -r Python-2.5/Modules/nismodule.c lang/python/src/Modules/nismodule.c
--- Python-2.5/Modules/nismodule.c	2006-02-27 16:46:16.000000000 +0000
+++ lang/python/src/Modules/nismodule.c	2007-02-15 23:15:12.000000000 +0000
@@ -137,7 +137,7 @@
 }
 
 static PyObject *
-nis_get_default_domain (PyObject *self)
+nis_get_default_domain(PyObject *self, PyObject *NOARGS_NULL)
 {
 	char *domain;
 	int err;
diff -u -r Python-2.5/Modules/ossaudiodev.c lang/python/src/Modules/ossaudiodev.c
--- Python-2.5/Modules/ossaudiodev.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/ossaudiodev.c	2007-02-15 23:43:59.000000000 +0000
@@ -296,7 +296,7 @@
  */
 
 static PyObject *
-oss_nonblock(oss_audio_t *self, PyObject *unused)
+oss_nonblock(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     /* Hmmm: it doesn't appear to be possible to return to blocking
        mode once we're in non-blocking mode! */
@@ -313,7 +313,7 @@
 }
 
 static PyObject *
-oss_getfmts(oss_audio_t *self, PyObject *unused)
+oss_getfmts(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     int mask;
     if (ioctl(self->fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
@@ -455,7 +455,7 @@
 }
 
 static PyObject *
-oss_close(oss_audio_t *self, PyObject *unused)
+oss_close(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     if (self->fd >= 0) {
         Py_BEGIN_ALLOW_THREADS
@@ -468,7 +468,7 @@
 }
 
 static PyObject *
-oss_fileno(oss_audio_t *self, PyObject *unused)
+oss_fileno(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     return PyInt_FromLong(self->fd);
 }
@@ -569,7 +569,7 @@
 /* bufsize returns the size of the hardware audio buffer in number
    of samples */
 static PyObject *
-oss_bufsize(oss_audio_t *self, PyObject *unused)
+oss_bufsize(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     audio_buf_info ai;
     int nchannels=0, ssize=0;
@@ -588,7 +588,7 @@
 /* obufcount returns the number of samples that are available in the
    hardware for playing */
 static PyObject *
-oss_obufcount(oss_audio_t *self, PyObject *unused)
+oss_obufcount(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     audio_buf_info ai;
     int nchannels=0, ssize=0;
@@ -608,7 +608,7 @@
 /* obufcount returns the number of samples that can be played without
    blocking */
 static PyObject *
-oss_obuffree(oss_audio_t *self, PyObject *unused)
+oss_obuffree(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     audio_buf_info ai;
     int nchannels=0, ssize=0;
@@ -625,7 +625,7 @@
 }
 
 static PyObject *
-oss_getptr(oss_audio_t *self, PyObject *unused)
+oss_getptr(oss_audio_t *self, PyObject *NOARGS_NULL)
 {
     count_info info;
     int req;
@@ -647,7 +647,7 @@
  */
 
 static PyObject *
-oss_mixer_close(oss_mixer_t *self, PyObject *unused)
+oss_mixer_close(oss_mixer_t *self, PyObject *NOARGS_NULL)
 {
     if (self->fd >= 0) {
         close(self->fd);
@@ -658,7 +658,7 @@
 }
 
 static PyObject *
-oss_mixer_fileno(oss_mixer_t *self, PyObject *unused)
+oss_mixer_fileno(oss_mixer_t *self, PyObject *NOARGS_NULL)
 {
     return PyInt_FromLong(self->fd);
 }
diff -u -r Python-2.5/Modules/pyexpat.c lang/python/src/Modules/pyexpat.c
--- Python-2.5/Modules/pyexpat.c	2006-07-06 06:13:22.000000000 +0100
+++ lang/python/src/Modules/pyexpat.c	2007-02-15 23:36:24.000000000 +0000
@@ -1074,7 +1074,7 @@
 Return base URL string for the parser.");
 
 static PyObject *
-xmlparse_GetBase(xmlparseobject *self, PyObject *unused)
+xmlparse_GetBase(xmlparseobject *self, PyObject *NOARGS_NULL)
 {
     return Py_BuildValue("z", XML_GetBase(self->itself));
 }
@@ -1086,7 +1086,7 @@
 for an element with many attributes), not all of the text may be available.");
 
 static PyObject *
-xmlparse_GetInputContext(xmlparseobject *self, PyObject *unused)
+xmlparse_GetInputContext(xmlparseobject *self, PyObject *NOARGS_NULL)
 {
     if (self->in_callback) {
         int offset, size;
diff -u -r Python-2.5/Modules/readline.c lang/python/src/Modules/readline.c
--- Python-2.5/Modules/readline.c	2006-07-16 03:15:27.000000000 +0100
+++ lang/python/src/Modules/readline.c	2007-02-15 23:30:32.000000000 +0000
@@ -151,7 +151,7 @@
 /* Get history length */
 
 static PyObject*
-get_history_length(PyObject *self, PyObject *noarg)
+get_history_length(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyInt_FromLong(_history_length);
 }
@@ -246,7 +246,7 @@
 /* Get the beginning index for the scope of the tab-completion */
 
 static PyObject *
-get_begidx(PyObject *self, PyObject *noarg)
+get_begidx(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_INCREF(begidx);
 	return begidx;
@@ -260,7 +260,7 @@
 /* Get the ending index for the scope of the tab-completion */
 
 static PyObject *
-get_endidx(PyObject *self, PyObject *noarg)
+get_endidx(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_INCREF(endidx);
 	return endidx;
@@ -386,7 +386,7 @@
 /* Get the tab-completion word-delimiters that readline uses */
 
 static PyObject *
-get_completer_delims(PyObject *self, PyObject *noarg)
+get_completer_delims(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyString_FromString(rl_completer_word_break_characters);
 }
@@ -413,7 +413,7 @@
 
 
 static PyObject *
-get_completer(PyObject *self, PyObject *noargs)
+get_completer(PyObject *self, PyObject *NOARGS_NULL)
 {
 	if (completer == NULL) {
 		Py_INCREF(Py_None);
@@ -454,7 +454,7 @@
 /* Exported function to get current length of history */
 
 static PyObject *
-get_current_history_length(PyObject *self, PyObject *noarg)
+get_current_history_length(PyObject *self, PyObject *NOARGS_NULL)
 {
 	HISTORY_STATE *hist_st;
 
@@ -470,7 +470,7 @@
 /* Exported function to read the current line buffer */
 
 static PyObject *
-get_line_buffer(PyObject *self, PyObject *noarg)
+get_line_buffer(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyString_FromString(rl_line_buffer);
 }
@@ -485,7 +485,7 @@
 /* Exported function to clear the current history */
 
 static PyObject *
-py_clear_history(PyObject *self, PyObject *noarg)
+py_clear_history(PyObject *self, PyObject *NOARGS_NULL)
 {
 	clear_history();
 	Py_INCREF(Py_None);
@@ -519,7 +519,7 @@
 /* Redisplay the line buffer */
 
 static PyObject *
-redisplay(PyObject *self, PyObject *noarg)
+redisplay(PyObject *self, PyObject *NOARGS_NULL)
 {
 	rl_redisplay();
 	Py_INCREF(Py_None);
diff -u -r Python-2.5/Modules/resource.c lang/python/src/Modules/resource.c
--- Python-2.5/Modules/resource.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/resource.c	2007-02-15 23:09:31.000000000 +0000
@@ -194,7 +194,7 @@
 }
 
 static PyObject *
-resource_getpagesize(PyObject *self, PyObject *unused)
+resource_getpagesize(PyObject *self, PyObject *NOARGS_NULL)
 {
 	long pagesize = 0;
 #if defined(HAVE_GETPAGESIZE)
diff -u -r Python-2.5/Modules/sha256module.c lang/python/src/Modules/sha256module.c
--- Python-2.5/Modules/sha256module.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/sha256module.c	2007-02-15 22:56:33.000000000 +0000
@@ -405,7 +405,7 @@
 PyDoc_STRVAR(SHA256_copy__doc__, "Return a copy of the hash object.");
 
 static PyObject *
-SHA256_copy(SHAobject *self, PyObject *unused)
+SHA256_copy(SHAobject *self, PyObject *NOARGS_NULL)
 {
     SHAobject *newobj;
 
@@ -425,7 +425,7 @@
 "Return the digest value as a string of binary data.");
 
 static PyObject *
-SHA256_digest(SHAobject *self, PyObject *unused)
+SHA256_digest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
@@ -439,7 +439,7 @@
 "Return the digest value as a string of hexadecimal digits.");
 
 static PyObject *
-SHA256_hexdigest(SHAobject *self, PyObject *unused)
+SHA256_hexdigest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
diff -u -r Python-2.5/Modules/sha512module.c lang/python/src/Modules/sha512module.c
--- Python-2.5/Modules/sha512module.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/sha512module.c	2007-02-15 23:42:39.000000000 +0000
@@ -471,7 +471,7 @@
 PyDoc_STRVAR(SHA512_copy__doc__, "Return a copy of the hash object.");
 
 static PyObject *
-SHA512_copy(SHAobject *self, PyObject *unused)
+SHA512_copy(SHAobject *self, PyObject *NOARGS_NULL)
 {
     SHAobject *newobj;
 
@@ -491,7 +491,7 @@
 "Return the digest value as a string of binary data.");
 
 static PyObject *
-SHA512_digest(SHAobject *self, PyObject *unused)
+SHA512_digest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
@@ -505,7 +505,7 @@
 "Return the digest value as a string of hexadecimal digits.");
 
 static PyObject *
-SHA512_hexdigest(SHAobject *self, PyObject *unused)
+SHA512_hexdigest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
diff -u -r Python-2.5/Modules/shamodule.c lang/python/src/Modules/shamodule.c
--- Python-2.5/Modules/shamodule.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/shamodule.c	2007-02-15 23:15:07.000000000 +0000
@@ -358,7 +358,7 @@
 PyDoc_STRVAR(SHA_copy__doc__, "Return a copy of the hashing object.");
 
 static PyObject *
-SHA_copy(SHAobject *self, PyObject *unused)
+SHA_copy(SHAobject *self, PyObject *NOARGS_NULL)
 {
     SHAobject *newobj;
 
@@ -373,7 +373,7 @@
 "Return the digest value as a string of binary data.");
 
 static PyObject *
-SHA_digest(SHAobject *self, PyObject *unused)
+SHA_digest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
@@ -387,7 +387,7 @@
 "Return the digest value as a string of hexadecimal digits.");
 
 static PyObject *
-SHA_hexdigest(SHAobject *self, PyObject *unused)
+SHA_hexdigest(SHAobject *self, PyObject *NOARGS_NULL)
 {
     unsigned char digest[SHA_DIGESTSIZE];
     SHAobject temp;
diff -u -r Python-2.5/Modules/socketmodule.c lang/python/src/Modules/socketmodule.c
--- Python-2.5/Modules/socketmodule.c	2006-08-14 23:10:24.000000000 +0100
+++ lang/python/src/Modules/socketmodule.c	2007-02-15 23:18:56.000000000 +0000
@@ -1525,7 +1525,7 @@
 /* s.accept() method */
 
 static PyObject *
-sock_accept(PySocketSockObject *s)
+sock_accept(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	sock_addr_t addrbuf;
 	SOCKET_T newfd;
@@ -1667,7 +1667,7 @@
 /* s.gettimeout() method.
    Returns the timeout associated with a socket. */
 static PyObject *
-sock_gettimeout(PySocketSockObject *s)
+sock_gettimeout(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	if (s->sock_timeout < 0.0) {
 		Py_INCREF(Py_None);
@@ -1847,7 +1847,7 @@
    will surely fail. */
 
 static PyObject *
-sock_close(PySocketSockObject *s)
+sock_close(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	SOCKET_T fd;
 
@@ -2018,7 +2018,7 @@
 /* s.fileno() method */
 
 static PyObject *
-sock_fileno(PySocketSockObject *s)
+sock_fileno(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 #if SIZEOF_SOCKET_T <= SIZEOF_LONG
 	return PyInt_FromLong((long) s->sock_fd);
@@ -2037,7 +2037,7 @@
 /* s.dup() method */
 
 static PyObject *
-sock_dup(PySocketSockObject *s)
+sock_dup(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	SOCKET_T newfd;
 	PyObject *sock;
@@ -2065,7 +2065,7 @@
 /* s.getsockname() method */
 
 static PyObject *
-sock_getsockname(PySocketSockObject *s)
+sock_getsockname(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	sock_addr_t addrbuf;
 	int res;
@@ -2094,7 +2094,7 @@
 /* s.getpeername() method */
 
 static PyObject *
-sock_getpeername(PySocketSockObject *s)
+sock_getpeername(PySocketSockObject *s, PyObject *NOARGS_NULL)
 {
 	sock_addr_t addrbuf;
 	int res;
@@ -2943,7 +2943,7 @@
 
 /*ARGSUSED*/
 static PyObject *
-socket_gethostname(PyObject *self, PyObject *unused)
+socket_gethostname(PyObject *self, PyObject *NOARGS_NULL)
 {
 	char buf[1024];
 	int res;
@@ -3983,7 +3983,7 @@
 /* Python API to getting and setting the default timeout value. */
 
 static PyObject *
-socket_getdefaulttimeout(PyObject *self)
+socket_getdefaulttimeout(PyObject *self, PyObject *NOARGS_NULL)
 {
 	if (defaulttimeout < 0.0) {
 		Py_INCREF(Py_None);
diff -u -r Python-2.5/Modules/spwdmodule.c lang/python/src/Modules/spwdmodule.c
--- Python-2.5/Modules/spwdmodule.c	2006-08-02 07:15:10.000000000 +0100
+++ lang/python/src/Modules/spwdmodule.c	2007-02-15 23:35:24.000000000 +0000
@@ -133,7 +133,7 @@
 See spwd.__doc__ for more on shadow password database entries.");
 
 static PyObject *
-spwd_getspall(PyObject *self, PyObject *args)
+spwd_getspall(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyObject *d;
 	struct spwd *p;
diff -u -r Python-2.5/Modules/sunaudiodev.c lang/python/src/Modules/sunaudiodev.c
--- Python-2.5/Modules/sunaudiodev.c	2006-01-19 06:09:39.000000000 +0000
+++ lang/python/src/Modules/sunaudiodev.c	2007-02-15 23:31:08.000000000 +0000
@@ -188,7 +188,7 @@
 }
 
 static PyObject *
-sad_getinfo(sadobject *self)
+sad_getinfo(sadobject *self, PyObject *NOARGS_NULL)
 {
 	sadstatusobject *rv;
 
@@ -220,7 +220,7 @@
 }
 
 static PyObject *
-sad_ibufcount(sadobject *self)
+sad_ibufcount(sadobject *self, PyObject *NOARGS_NULL)
 {
 	audio_info_t ai;
     
@@ -232,7 +232,7 @@
 }
 
 static PyObject *
-sad_obufcount(sadobject *self)
+sad_obufcount(sadobject *self, PyObject *NOARGS_NULL)
 {
 	audio_info_t ai;
     
@@ -248,7 +248,7 @@
 }
 
 static PyObject *
-sad_drain(sadobject *self)
+sad_drain(sadobject *self, PyObject *NOARGS_NULL)
 {
 	if (ioctl(self->x_fd, AUDIO_DRAIN, 0) < 0) {
 		PyErr_SetFromErrno(SunAudioError);
@@ -260,7 +260,7 @@
 
 #ifdef SOLARIS
 static PyObject *
-sad_getdev(sadobject *self)
+sad_getdev(sadobject *self, PyObject *NOARGS_NULL)
 {
 	struct audio_device ad;
 
@@ -273,7 +273,7 @@
 #endif
 
 static PyObject *
-sad_flush(sadobject *self)
+sad_flush(sadobject *self, PyObject *NOARGS_NULL)
 {
 	if (ioctl(self->x_fd, I_FLUSH, FLUSHW) < 0) {
 		PyErr_SetFromErrno(SunAudioError);
@@ -284,7 +284,7 @@
 }
 
 static PyObject *
-sad_close(sadobject *self)
+sad_close(sadobject *self, PyObject *NOARGS_NULL)
 {
     
 	if (self->x_fd >= 0) {
@@ -296,7 +296,7 @@
 }
 
 static PyObject *
-sad_fileno(sadobject *self)
+sad_fileno(sadobject *self, PyObject *NOARGS_NULL)
 {
 	return PyInt_FromLong(self->x_fd);
 }
diff -u -r Python-2.5/Modules/syslogmodule.c lang/python/src/Modules/syslogmodule.c
--- Python-2.5/Modules/syslogmodule.c	2006-05-29 22:04:52.000000000 +0100
+++ lang/python/src/Modules/syslogmodule.c	2007-02-15 23:37:17.000000000 +0000
@@ -98,7 +98,7 @@
 }
 
 static PyObject * 
-syslog_closelog(PyObject *self, PyObject *unused)
+syslog_closelog(PyObject *self, PyObject *NOARGS_NULL)
 {
 	closelog();
 	Py_XDECREF(S_ident_o);
diff -u -r Python-2.5/Modules/threadmodule.c lang/python/src/Modules/threadmodule.c
--- Python-2.5/Modules/threadmodule.c	2006-06-13 17:06:55.000000000 +0100
+++ lang/python/src/Modules/threadmodule.c	2007-02-15 23:42:02.000000000 +0000
@@ -60,7 +60,7 @@
 The blocking operation is not interruptible.");
 
 static PyObject *
-lock_PyThread_release_lock(lockobject *self)
+lock_PyThread_release_lock(lockobject *self, PyObject *NOARGS_NULL)
 {
 	/* Sanity check: the lock must be locked */
 	if (PyThread_acquire_lock(self->lock_lock, 0)) {
@@ -83,7 +83,7 @@
 but it needn't be locked by the same thread that unlocks it.");
 
 static PyObject *
-lock_locked_lock(lockobject *self)
+lock_locked_lock(lockobject *self, PyObject *NOARGS_NULL)
 {
 	if (PyThread_acquire_lock(self->lock_lock, 0)) {
 		PyThread_release_lock(self->lock_lock);
@@ -509,7 +509,7 @@
 printed unless the exception is SystemExit.\n");
 
 static PyObject *
-thread_PyThread_exit_thread(PyObject *self)
+thread_PyThread_exit_thread(PyObject *self, PyObject *NOARGS_NULL)
 {
 	PyErr_SetNone(PyExc_SystemExit);
 	return NULL;
@@ -523,7 +523,7 @@
 thread to exit silently unless the exception is caught.");
 
 static PyObject *
-thread_PyThread_interrupt_main(PyObject * self)
+thread_PyThread_interrupt_main(PyObject * self, PyObject *NOARGS_NULL)
 {
 	PyErr_SetInterrupt();
 	Py_INCREF(Py_None);
@@ -552,7 +552,7 @@
 static lockobject *newlockobject(void);
 
 static PyObject *
-thread_PyThread_allocate_lock(PyObject *self)
+thread_PyThread_allocate_lock(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return (PyObject *) newlockobject();
 }
@@ -564,7 +564,7 @@
 Create a new lock object.  See LockType.__doc__ for information about locks.");
 
 static PyObject *
-thread_get_ident(PyObject *self)
+thread_get_ident(PyObject *self, PyObject *NOARGS_NULL)
 {
 	long ident;
 	ident = PyThread_get_thread_ident();
diff -u -r Python-2.5/Modules/timingmodule.c lang/python/src/Modules/timingmodule.c
--- Python-2.5/Modules/timingmodule.c	2002-08-02 03:27:13.000000000 +0100
+++ lang/python/src/Modules/timingmodule.c	2007-02-15 23:02:00.000000000 +0000
@@ -8,7 +8,7 @@
 #include "timing.h"
 
 static PyObject *
-start_timing(PyObject *self)
+start_timing(PyObject *self, PyObject *NOARGS_NULL)
 {
 	Py_INCREF(Py_None);
 	BEGINTIMING;
@@ -16,7 +16,7 @@
 }
 
 static PyObject *
-finish_timing(PyObject *self)
+finish_timing(PyObject *self, PyObject *NOARGS_NULL)
 {
 	ENDTIMING    
 	Py_INCREF(Py_None);
@@ -24,19 +24,19 @@
 }
 
 static PyObject *
-seconds(PyObject *self)
+seconds(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyInt_FromLong(TIMINGS);
 }
 
 static PyObject *
-milli(PyObject *self)
+milli(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyInt_FromLong(TIMINGMS);
 }
 
 static PyObject *
-micro(PyObject *self)
+micro(PyObject *self, PyObject *NOARGS_NULL)
 {
 	return PyInt_FromLong(TIMINGUS);
 }
diff -u -r Python-2.5/Modules/xxsubtype.c lang/python/src/Modules/xxsubtype.c
--- Python-2.5/Modules/xxsubtype.c	2006-04-12 05:29:01.000000000 +0100
+++ lang/python/src/Modules/xxsubtype.c	2007-02-16 11:25:32.783346696 +0000
@@ -89,7 +89,7 @@
 }
 
 static PyObject *
-spamlist_state_get(spamlistobject *self)
+spamlist_state_get(spamlistobject *self, void *closure)
 {
 	return PyInt_FromLong(self->state);
 }
diff -u -r Python-2.5/Modules/zlibmodule.c lang/python/src/Modules/zlibmodule.c
--- Python-2.5/Modules/zlibmodule.c	2006-06-12 04:33:09.000000000 +0100
+++ lang/python/src/Modules/zlibmodule.c	2007-02-15 23:42:49.000000000 +0000
@@ -658,7 +658,7 @@
 "copy() -- Return a copy of the compression object.");
 
 static PyObject *
-PyZlib_copy(compobject *self)
+PyZlib_copy(compobject *self, PyObject *NOARGS_NULL)
 {
     compobject *retval = NULL;
     int err;
@@ -709,7 +709,7 @@
 "copy() -- Return a copy of the decompression object.");
 
 static PyObject *
-PyZlib_uncopy(compobject *self)
+PyZlib_uncopy(compobject *self, PyObject *NOARGS_NULL)
 {
     compobject *retval = NULL;
     int err;