Finish getting rid of statichere/staticforward

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 9d0893e7cadc7a6f2b39ca21c3e76fcc725bddac..8e9ec0f0cfc9e593f1c4fe5d430887cdd1df7683 100644 (file)
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -283,7 +283,7 @@ typedef struct {
 
 
 
-staticforward PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type;
+static PyTypeObject DB_Type, DBCursor_Type, DBEnv_Type, DBTxn_Type, DBLock_Type;
 
 #define DBObject_Check(v)           ((v)->ob_type == &DB_Type)
 #define DBCursorObject_Check(v)     ((v)->ob_type == &DBCursor_Type)
@@ -4823,7 +4823,7 @@ DBLock_getattr(DBLockObject* self, char *name)
     return NULL;
 }
 
-statichere PyTypeObject DB_Type = {
+static PyTypeObject DB_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                  /*ob_size*/
     "DB",               /*tp_name*/
@@ -4856,7 +4856,7 @@ statichere PyTypeObject DB_Type = {
 };
 
 
-statichere PyTypeObject DBCursor_Type = {
+static PyTypeObject DBCursor_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                  /*ob_size*/
     "DBCursor",         /*tp_name*/
@@ -4889,7 +4889,7 @@ statichere PyTypeObject DBCursor_Type = {
 };
 
 
-statichere PyTypeObject DBEnv_Type = {
+static PyTypeObject DBEnv_Type = {
     PyObject_HEAD_INIT(NULL)
     0,          /*ob_size*/
     "DBEnv",            /*tp_name*/
@@ -4921,7 +4921,7 @@ statichere PyTypeObject DBEnv_Type = {
 #endif
 };
 
-statichere PyTypeObject DBTxn_Type = {
+static PyTypeObject DBTxn_Type = {
     PyObject_HEAD_INIT(NULL)
     0,          /*ob_size*/
     "DBTxn",    /*tp_name*/
@@ -4954,7 +4954,7 @@ statichere PyTypeObject DBTxn_Type = {
 };
 
 
-statichere PyTypeObject DBLock_Type = {
+static PyTypeObject DBLock_Type = {
     PyObject_HEAD_INIT(NULL)
     0,          /*ob_size*/
     "DBLock",   /*tp_name*/

diff --git a/Modules/_csv.c b/Modules/_csv.c
index da5ae0d238d6774b9a46f73d3e43b50591e0bfa2..469cd64e121e04e9d09a332f9e5438b330c7b00a 100644 (file)
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -83,7 +83,7 @@ typedef struct {
        int strict;             /* raise exception on bad CSV */
 } DialectObj;
 
-staticforward PyTypeObject Dialect_Type;
+static PyTypeObject Dialect_Type;
 
 typedef struct {
         PyObject_HEAD
@@ -101,7 +101,7 @@ typedef struct {
        unsigned long line_num; /* Source-file line number */
 } ReaderObj;
 
-staticforward PyTypeObject Reader_Type;
+static PyTypeObject Reader_Type;
 
 #define ReaderObject_Check(v)   ((v)->ob_type == &Reader_Type)
 
@@ -118,7 +118,7 @@ typedef struct {
        int num_fields;         /* number of fields in record */
 } WriterObj;        
 
-staticforward PyTypeObject Writer_Type;
+static PyTypeObject Writer_Type;
 
 /*
  * DIALECT class

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index bf88af8f1e7840681dffa8f5da7f973787428d5f..3a7d3efbfaf8ddef025470e9d1e86589818c8813 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -591,7 +591,7 @@ PointerType_set_type(PyTypeObject *self, PyObject *type)
        return Py_None;
 }
 
-staticforward PyObject *_byref(PyObject *);
+static PyObject *_byref(PyObject *);
 
 static PyObject *
 PointerType_from_param(PyObject *type, PyObject *value)

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 06ae24c37cc6a02e97e669b0f507c6f3268929c1..7e36ea384b1c5faa73b01a693bff75b02dedf7a5 100644 (file)
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -267,7 +267,7 @@ typedef struct {
 
 } ElementObject;
 
-staticforward PyTypeObject Element_Type;
+static PyTypeObject Element_Type;
 
 #define Element_CheckExact(op) ((op)->ob_type == &Element_Type)
 
@@ -1396,7 +1396,7 @@ static PySequenceMethods element_as_sequence = {
     element_setslice,
 };
 
-statichere PyTypeObject Element_Type = {
+static PyTypeObject Element_Type = {
     PyObject_HEAD_INIT(NULL)
     0, "Element", sizeof(ElementObject), 0,
     /* methods */
@@ -1435,7 +1435,7 @@ typedef struct {
 
 } TreeBuilderObject;
 
-staticforward PyTypeObject TreeBuilder_Type;
+static PyTypeObject TreeBuilder_Type;
 
 #define TreeBuilder_CheckExact(op) ((op)->ob_type == &TreeBuilder_Type)
 
@@ -1805,7 +1805,7 @@ treebuilder_getattr(TreeBuilderObject* self, char* name)
     return Py_FindMethod(treebuilder_methods, (PyObject*) self, name);
 }
 
-statichere PyTypeObject TreeBuilder_Type = {
+static PyTypeObject TreeBuilder_Type = {
     PyObject_HEAD_INIT(NULL)
     0, "TreeBuilder", sizeof(TreeBuilderObject), 0,
     /* methods */
@@ -1849,7 +1849,7 @@ typedef struct {
 
 } XMLParserObject;
 
-staticforward PyTypeObject XMLParser_Type;
+static PyTypeObject XMLParser_Type;
 
 /* helpers */
 
@@ -2580,7 +2580,7 @@ xmlparser_getattr(XMLParserObject* self, char* name)
     return res;
 }
 
-statichere PyTypeObject XMLParser_Type = {
+static PyTypeObject XMLParser_Type = {
     PyObject_HEAD_INIT(NULL)
     0, "XMLParser", sizeof(XMLParserObject), 0,
     /* methods */

diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index dddab8ea1a92e566922bc4a6783a69bd503702a5..17c71e9ec5606fc77d85137ff7fe974c7c82283a 100644 (file)
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -117,7 +117,7 @@ typedef struct {
 #define POF_BUILTINS    0x004
 #define POF_NOMEMORY    0x100
 
-staticforward PyTypeObject PyProfiler_Type;
+static PyTypeObject PyProfiler_Type;
 
 #define PyProfiler_Check(op) PyObject_TypeCheck(op, &PyProfiler_Type)
 #define PyProfiler_CheckExact(op) ((op)->ob_type == &PyProfiler_Type)
@@ -798,7 +798,7 @@ Profiler(custom_timer=None, time_unit=None, subcalls=True, builtins=True)\n\
     is, in seconds).\n\
 ");
 
-statichere PyTypeObject PyProfiler_Type = {
+static PyTypeObject PyProfiler_Type = {
        PyObject_HEAD_INIT(NULL)
        0,                                      /* ob_size */
        "_lsprof.Profiler",                     /* tp_name */

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index b85e15844cf3d17a0bb70d43956039145068ddc7..e8efaa7a19bd51e20d7e463380bf34ecdb44c718 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -720,7 +720,7 @@ typedef struct {
        PyObject *string; /* This cannot cause cycles. */
 } PyTclObject;
 
-staticforward PyTypeObject PyTclObject_Type;
+static PyTypeObject PyTclObject_Type;
 #define PyTclObject_Check(v)   ((v)->ob_type == &PyTclObject_Type)
 
 static PyObject *
@@ -858,7 +858,7 @@ static PyMethodDef PyTclObject_methods[] = {
        {0}
 };
 
-statichere PyTypeObject PyTclObject_Type = {
+static PyTypeObject PyTclObject_Type = {
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
        "_tkinter.Tcl_Obj",             /*tp_name*/

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 199ee654f8c4ae5704d4881c8b575d06e6e71ad4..b0117296e54392f901d0c3e80334eab65fa4e7f6 100644 (file)
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -2931,7 +2931,7 @@ static PyMethodDef tzinfo_methods[] = {
 static char tzinfo_doc[] =
 PyDoc_STR("Abstract base class for time zone info objects.");
 
-statichere PyTypeObject PyDateTime_TZInfoType = {
+static PyTypeObject PyDateTime_TZInfoType = {
        PyObject_HEAD_INIT(NULL)
        0,                                      /* ob_size */
        "datetime.tzinfo",                      /* tp_name */
@@ -3451,7 +3451,7 @@ static PyNumberMethods time_as_number = {
        (inquiry)time_nonzero,                  /* nb_nonzero */
 };
 
-statichere PyTypeObject PyDateTime_TimeType = {
+static PyTypeObject PyDateTime_TimeType = {
        PyObject_HEAD_INIT(NULL)
        0,                                      /* ob_size */
        "datetime.time",                        /* tp_name */
@@ -4536,7 +4536,7 @@ static PyNumberMethods datetime_as_number = {
        0,                                      /* nb_nonzero */
 };
 
-statichere PyTypeObject PyDateTime_DateTimeType = {
+static PyTypeObject PyDateTime_DateTimeType = {
        PyObject_HEAD_INIT(NULL)
        0,                                      /* ob_size */
        "datetime.datetime",                    /* tp_name */

diff --git a/PC/_subprocess.c b/PC/_subprocess.c
index b675b88462e80891db7f653eb167e4288469153d..1ca4ece4e083d0adaed67918458787a50896db0f 100644 (file)
--- a/PC/_subprocess.c
+++ b/PC/_subprocess.c
@@ -53,7 +53,7 @@ typedef struct {
        HANDLE handle;
 } sp_handle_object;
 
-staticforward PyTypeObject sp_handle_type;
+static PyTypeObject sp_handle_type;
 
 static PyObject*
 sp_handle_new(HANDLE handle)
@@ -127,7 +127,7 @@ sp_handle_as_int(sp_handle_object* self)
 
 static PyNumberMethods sp_handle_as_number;
 
-statichere PyTypeObject sp_handle_type = {
+static PyTypeObject sp_handle_type = {
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
        "_subprocess_handle", sizeof(sp_handle_object), 0,