ANSIfications: fix empty arglists, and remove the checks for
'HAVE_STDARG_PROTOTYPES' (consider it true, remove false branch)
diff --git a/Include/ceval.h b/Include/ceval.h
index 5258d57..9468451 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -27,15 +27,9 @@
#define PyEval_CallObject(func,arg) \
PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
-#ifdef HAVE_STDARG_PROTOTYPES
DL_IMPORT(PyObject *) PyEval_CallFunction(PyObject *obj, char *format, ...);
DL_IMPORT(PyObject *) PyEval_CallMethod(PyObject *obj,
char *methodname, char *format, ...);
-#else
-/* Better to have no prototypes at all for varargs functions in this case */
-DL_IMPORT(PyObject *) PyEval_CallFunction();
-DL_IMPORT(PyObject *) PyEval_CallMethod();
-#endif
DL_IMPORT(PyObject *) PyEval_GetBuiltins(void);
DL_IMPORT(PyObject *) PyEval_GetGlobals(void);
diff --git a/Include/import.h b/Include/import.h
index 73f242f..c11d33e 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -35,12 +35,12 @@
struct _inittab {
char *name;
- void (*initfunc)();
+ void (*initfunc)(void);
};
extern DL_IMPORT(struct _inittab *) PyImport_Inittab;
-extern DL_IMPORT(int) PyImport_AppendInittab(char *name, void (*initfunc)());
+extern DL_IMPORT(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));
extern DL_IMPORT(int) PyImport_ExtendInittab(struct _inittab *newtab);
struct _frozen {
diff --git a/Include/modsupport.h b/Include/modsupport.h
index c55b46b..75449f2 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -16,8 +16,6 @@
/* Module support interface */
-#ifdef HAVE_STDARG_PROTOTYPES
-
#include <stdarg.h>
extern DL_IMPORT(int) PyArg_Parse(PyObject *, char *, ...);
@@ -26,17 +24,6 @@
char *, char **, ...);
extern DL_IMPORT(PyObject *) Py_BuildValue(char *, ...);
-#else
-
-#include <varargs.h>
-
-/* Better to have no prototypes at all for varargs functions in this case */
-extern DL_IMPORT(int) PyArg_Parse();
-extern DL_IMPORT(int) PyArg_ParseTuple();
-extern DL_IMPORT(PyObject *) Py_BuildValue();
-
-#endif
-
extern DL_IMPORT(int) PyArg_VaParse(PyObject *, char *, va_list);
extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
diff --git a/Include/pgenheaders.h b/Include/pgenheaders.h
index 3834ff2..9d7e8ac 100644
--- a/Include/pgenheaders.h
+++ b/Include/pgenheaders.h
@@ -35,14 +35,8 @@
#include "pydebug.h"
-#ifdef HAVE_STDARG_PROTOTYPES
DL_IMPORT(void) PySys_WriteStdout(const char *format, ...);
DL_IMPORT(void) PySys_WriteStderr(const char *format, ...);
-#else
-/* Better to have no prototypes at all for varargs functions in this case */
-DL_IMPORT(void) PySys_WriteStdout();
-DL_IMPORT(void) PySys_WriteStderr();
-#endif
#define addarc _Py_addarc
#define addbit _Py_addbit
diff --git a/Include/sysmodule.h b/Include/sysmodule.h
index e208fc3..a2920c0 100644
--- a/Include/sysmodule.h
+++ b/Include/sysmodule.h
@@ -22,14 +22,8 @@
DL_IMPORT(void) PySys_SetArgv(int, char **);
DL_IMPORT(void) PySys_SetPath(char *);
-#ifdef HAVE_STDARG_PROTOTYPES
DL_IMPORT(void) PySys_WriteStdout(const char *format, ...);
DL_IMPORT(void) PySys_WriteStderr(const char *format, ...);
-#else
-/* Better to have no prototypes at all for varargs functions in this case */
-DL_IMPORT(void) PySys_WriteStdout();
-DL_IMPORT(void) PySys_WriteStderr();
-#endif
extern DL_IMPORT(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc;
extern DL_IMPORT(int) _PySys_CheckInterval;
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 41fffc0..95e9f02 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -376,7 +376,7 @@
*/
-extern DL_IMPORT(const char*) PyUnicode_GetDefaultEncoding();
+extern DL_IMPORT(const char*) PyUnicode_GetDefaultEncoding(void);
/* Sets the currently active default encoding.