ANSI-fication and Py_PROTO extermination.

1 files changed, 33 insertions, 32 deletions

diff --git a/Include/classobject.h b/Include/classobject.h
index 7fcf6ec789..2902e771e8 100644
--- a/Include/classobject.h
+++ b/Include/classobject.h
@@ -1,9 +1,3 @@
-#ifndef Py_CLASSOBJECT_H
-#define Py_CLASSOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
 Copyright (c) 1995-2000, Corporation for National Research Initiatives.
@@ -18,28 +12,34 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 /* Revealing some structures (not for general use) */
 
+#ifndef Py_CLASSOBJECT_H
+#define Py_CLASSOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
-	PyObject_HEAD
-	PyObject	*cl_bases;	/* A tuple of class objects */
-	PyObject	*cl_dict;	/* A dictionary */
-	PyObject	*cl_name;	/* A string */
-	/* The following three are functions or NULL */
-	PyObject	*cl_getattr;
-	PyObject	*cl_setattr;
-	PyObject	*cl_delattr;
+    PyObject_HEAD
+    PyObject	*cl_bases;	/* A tuple of class objects */
+    PyObject	*cl_dict;	/* A dictionary */
+    PyObject	*cl_name;	/* A string */
+    /* The following three are functions or NULL */
+    PyObject	*cl_getattr;
+    PyObject	*cl_setattr;
+    PyObject	*cl_delattr;
 } PyClassObject;
 
 typedef struct {
-	PyObject_HEAD
-	PyClassObject	*in_class;	/* The class object */
-	PyObject	*in_dict;	/* A dictionary */
+    PyObject_HEAD
+    PyClassObject *in_class;	/* The class object */
+    PyObject	  *in_dict;	/* A dictionary */
 } PyInstanceObject;
 
 typedef struct {
-	PyObject_HEAD
-	PyObject *im_func;   /* The callable object implementing the method */
-	PyObject *im_self;   /* The instance it is bound to, or NULL */
-	PyObject *im_class;  /* The class that defined the method */
+    PyObject_HEAD
+    PyObject *im_func;   /* The callable object implementing the method */
+    PyObject *im_self;   /* The instance it is bound to, or NULL */
+    PyObject *im_class;  /* The class that defined the method */
 } PyMethodObject;
 
 extern DL_IMPORT(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type;
@@ -48,13 +48,14 @@ extern DL_IMPORT(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type;
 #define PyInstance_Check(op) ((op)->ob_type == &PyInstance_Type)
 #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)
 
-extern DL_IMPORT(PyObject *) PyClass_New Py_PROTO((PyObject *, PyObject *, PyObject *));
-extern DL_IMPORT(PyObject *) PyInstance_New Py_PROTO((PyObject *, PyObject *, PyObject *));
-extern DL_IMPORT(PyObject *) PyMethod_New Py_PROTO((PyObject *, PyObject *, PyObject *));
+extern DL_IMPORT(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *);
+extern DL_IMPORT(PyObject *) PyInstance_New(PyObject *, PyObject *,
+                                            PyObject *);
+extern DL_IMPORT(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *);
 
-extern DL_IMPORT(PyObject *) PyMethod_Function Py_PROTO((PyObject *));
-extern DL_IMPORT(PyObject *) PyMethod_Self Py_PROTO((PyObject *));
-extern DL_IMPORT(PyObject *) PyMethod_Class Py_PROTO((PyObject *));
+extern DL_IMPORT(PyObject *) PyMethod_Function(PyObject *);
+extern DL_IMPORT(PyObject *) PyMethod_Self(PyObject *);
+extern DL_IMPORT(PyObject *) PyMethod_Class(PyObject *);
 
 /* Macros for direct access to these values. Type checks are *not*
    done, so use with care. */
@@ -65,12 +66,12 @@ extern DL_IMPORT(PyObject *) PyMethod_Class Py_PROTO((PyObject *));
 #define PyMethod_GET_CLASS(meth) \
 	(((PyMethodObject *)meth) -> im_class)
 
-extern DL_IMPORT(int) PyClass_IsSubclass Py_PROTO((PyObject *, PyObject *));
+extern DL_IMPORT(int) PyClass_IsSubclass(PyObject *, PyObject *);
 
-extern DL_IMPORT(PyObject *) PyInstance_DoBinOp
-	Py_PROTO((PyObject *, PyObject *,
-		  char *, char *,
-		  PyObject * (*) Py_PROTO((PyObject *, PyObject *)) ));
+extern DL_IMPORT(PyObject *) PyInstance_DoBinOp(PyObject *, PyObject *,
+                                                char *, char *,
+                                                PyObject * (*)(PyObject *,
+                                                               PyObject *));
 
 #ifdef __cplusplus
 }