--- a/Python/modsupport.c	Sat Jul 22 18:45:06 2000 +0000
+++ b/Python/modsupport.c	Sat Jul 22 18:47:25 2000 +0000
@@ -42,12 +42,8 @@
   This Python has API version %d, module %s has version %d.\n";
 
 PyObject *
-Py_InitModule4(name, methods, doc, passthrough, module_api_version)
-	char *name;
-	PyMethodDef *methods;
-	char *doc;
-	PyObject *passthrough;
-	int module_api_version;
+Py_InitModule4(char *name, PyMethodDef *methods, char *doc,
+	       PyObject *passthrough, int module_api_version)
 {
 	PyObject *m, *d, *v;
 	PyMethodDef *ml;
@@ -84,10 +80,7 @@
 
 /* Helper for mkvalue() to scan the length of a format */
 
-static int countformat(char *format, int endchar);
-static int countformat(format, endchar)
-	char *format;
-	int endchar;
+static int countformat(char *format, int endchar)
 {
 	int count = 0;
 	int level = 0;
@@ -137,11 +130,7 @@
 
 
 static PyObject *
-do_mkdict(p_format, p_va, endchar, n)
-	char **p_format;
-	va_list *p_va;
-	int endchar;
-	int n;
+do_mkdict(char **p_format, va_list *p_va, int endchar, int n)
 {
 	PyObject *d;
 	int i;
@@ -183,11 +172,7 @@
 }
 
 static PyObject *
-do_mklist(p_format, p_va, endchar, n)
-	char **p_format;
-	va_list *p_va;
-	int endchar;
-	int n;
+do_mklist(char **p_format, va_list *p_va, int endchar, int n)
 {
 	PyObject *v;
 	int i;
@@ -224,11 +209,7 @@
 }
 
 static PyObject *
-do_mktuple(p_format, p_va, endchar, n)
-	char **p_format;
-	va_list *p_va;
-	int endchar;
-	int n;
+do_mktuple(char **p_format, va_list *p_va, int endchar, int n)
 {
 	PyObject *v;
 	int i;
@@ -256,9 +237,7 @@
 }
 
 static PyObject *
-do_mkvalue(p_format, p_va)
-	char **p_format;
-	va_list *p_va;
+do_mkvalue(char **p_format, va_list *p_va)
 {
 	for (;;) {
 		switch (*(*p_format)++) {
@@ -401,32 +380,18 @@
 }
 
 
-#ifdef HAVE_STDARG_PROTOTYPES
-/* VARARGS 2 */
 PyObject *Py_BuildValue(char *format, ...)
-#else
-/* VARARGS */
-PyObject *Py_BuildValue(va_alist) va_dcl
-#endif
 {
 	va_list va;
 	PyObject* retval;
-#ifdef HAVE_STDARG_PROTOTYPES
 	va_start(va, format);
-#else
-	char *format;
-	va_start(va);
-	format = va_arg(va, char *);
-#endif
 	retval = Py_VaBuildValue(format, va);
 	va_end(va);
 	return retval;
 }
 
 PyObject *
-Py_VaBuildValue(format, va)
-	char *format;
-	va_list va;
+Py_VaBuildValue(char *format, va_list va)
 {
 	char *f = format;
 	int n = countformat(f, '\0');
@@ -450,26 +415,14 @@
 }
 
 
-#ifdef HAVE_STDARG_PROTOTYPES
 PyObject *
 PyEval_CallFunction(PyObject *obj, char *format, ...)
-#else
-PyObject *
-PyEval_CallFunction(obj, format, va_alist)
-	PyObject *obj;
-	char *format;
-	va_dcl
-#endif
 {
 	va_list vargs;
 	PyObject *args;
 	PyObject *res;
 
-#ifdef HAVE_STDARG_PROTOTYPES
 	va_start(vargs, format);
-#else
-	va_start(vargs);
-#endif
 
 	args = Py_VaBuildValue(format, vargs);
 	va_end(vargs);
@@ -484,17 +437,8 @@
 }
 
 
-#ifdef HAVE_STDARG_PROTOTYPES
 PyObject *
 PyEval_CallMethod(PyObject *obj, char *methodname, char *format, ...)
-#else
-PyObject *
-PyEval_CallMethod(obj, methodname, format, va_alist)
-	PyObject *obj;
-	char *methodname;
-	char *format;
-	va_dcl
-#endif
 {
 	va_list vargs;
 	PyObject *meth;
@@ -505,11 +449,7 @@
 	if (meth == NULL)
 		return NULL;
 
-#ifdef HAVE_STDARG_PROTOTYPES
 	va_start(vargs, format);
-#else
-	va_start(vargs);
-#endif
 
 	args = Py_VaBuildValue(format, vargs);
 	va_end(vargs);