ANSI-fication of the sources -- remove Py_PROTO!

1 files changed, 22 insertions, 20 deletions

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index e521fe2..f461068 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -16,18 +16,18 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 /* Error handling definitions */
 
-DL_IMPORT(void) PyErr_SetNone Py_PROTO((PyObject *));
-DL_IMPORT(void) PyErr_SetObject Py_PROTO((PyObject *, PyObject *));
-DL_IMPORT(void) PyErr_SetString Py_PROTO((PyObject *, const char *));
-DL_IMPORT(PyObject *) PyErr_Occurred Py_PROTO((void));
-DL_IMPORT(void) PyErr_Clear Py_PROTO((void));
-DL_IMPORT(void) PyErr_Fetch Py_PROTO((PyObject **, PyObject **, PyObject **));
-DL_IMPORT(void) PyErr_Restore Py_PROTO((PyObject *, PyObject *, PyObject *));
+DL_IMPORT(void) PyErr_SetNone(PyObject *);
+DL_IMPORT(void) PyErr_SetObject(PyObject *, PyObject *);
+DL_IMPORT(void) PyErr_SetString(PyObject *, const char *);
+DL_IMPORT(PyObject *) PyErr_Occurred(void);
+DL_IMPORT(void) PyErr_Clear(void);
+DL_IMPORT(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
+DL_IMPORT(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
 
 /* Error testing and normalization */
-DL_IMPORT(int) PyErr_GivenExceptionMatches Py_PROTO((PyObject *, PyObject *));
-DL_IMPORT(int) PyErr_ExceptionMatches Py_PROTO((PyObject *));
-DL_IMPORT(void) PyErr_NormalizeException Py_PROTO((PyObject**, PyObject**, PyObject**));
+DL_IMPORT(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
+DL_IMPORT(int) PyErr_ExceptionMatches(PyObject *);
+DL_IMPORT(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
 
 
 /* Predefined exceptions */
@@ -54,6 +54,8 @@ extern DL_IMPORT(PyObject *) PyExc_OverflowError;
 extern DL_IMPORT(PyObject *) PyExc_RuntimeError;
 extern DL_IMPORT(PyObject *) PyExc_NotImplementedError;
 extern DL_IMPORT(PyObject *) PyExc_SyntaxError;
+extern DL_IMPORT(PyObject *) PyExc_IndentationError;
+extern DL_IMPORT(PyObject *) PyExc_TabError;
 extern DL_IMPORT(PyObject *) PyExc_SystemError;
 extern DL_IMPORT(PyObject *) PyExc_SystemExit;
 extern DL_IMPORT(PyObject *) PyExc_TypeError;
@@ -70,25 +72,25 @@ extern DL_IMPORT(PyObject *) PyExc_MemoryErrorInst;
 
 /* Convenience functions */
 
-extern DL_IMPORT(int) PyErr_BadArgument Py_PROTO((void));
-extern DL_IMPORT(PyObject *) PyErr_NoMemory Py_PROTO((void));
-extern DL_IMPORT(PyObject *) PyErr_SetFromErrno Py_PROTO((PyObject *));
-extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename Py_PROTO((PyObject *, char *));
-extern DL_IMPORT(PyObject *) PyErr_Format Py_PROTO((PyObject *, const char *, ...));
+extern DL_IMPORT(int) PyErr_BadArgument(void);
+extern DL_IMPORT(PyObject *) PyErr_NoMemory(void);
+extern DL_IMPORT(PyObject *) PyErr_SetFromErrno(PyObject *);
+extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
+extern DL_IMPORT(PyObject *) PyErr_Format(PyObject *, const char *, ...);
 #ifdef MS_WINDOWS
 extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
 extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErr(int);
 #endif
 
-extern DL_IMPORT(void) PyErr_BadInternalCall Py_PROTO((void));
+extern DL_IMPORT(void) PyErr_BadInternalCall(void);
 
 /* Function to create a new exception */
-DL_IMPORT(PyObject *) PyErr_NewException Py_PROTO((char *name, PyObject *base,
-				       PyObject *dict));
+DL_IMPORT(PyObject *) PyErr_NewException(char *name, PyObject *base,
+                                         PyObject *dict);
 
 /* In sigcheck.c or signalmodule.c */
-extern DL_IMPORT(int) PyErr_CheckSignals Py_PROTO((void));
-extern DL_IMPORT(void) PyErr_SetInterrupt Py_PROTO((void));
+extern DL_IMPORT(int) PyErr_CheckSignals(void);
+extern DL_IMPORT(void) PyErr_SetInterrupt(void);
 	
 
 #ifdef __cplusplus