Finish getting rid of statichere/staticforward

This commit is contained in:
Neal Norwitz 2006-03-22 09:28:35 +00:00
parent 914a81841f
commit 227b5339ed
8 changed files with 25 additions and 25 deletions

View file

@ -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 DBObject_Check(v) ((v)->ob_type == &DB_Type)
#define DBCursorObject_Check(v) ((v)->ob_type == &DBCursor_Type) #define DBCursorObject_Check(v) ((v)->ob_type == &DBCursor_Type)
@ -4823,7 +4823,7 @@ DBLock_getattr(DBLockObject* self, char *name)
return NULL; return NULL;
} }
statichere PyTypeObject DB_Type = { static PyTypeObject DB_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"DB", /*tp_name*/ "DB", /*tp_name*/
@ -4856,7 +4856,7 @@ statichere PyTypeObject DB_Type = {
}; };
statichere PyTypeObject DBCursor_Type = { static PyTypeObject DBCursor_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"DBCursor", /*tp_name*/ "DBCursor", /*tp_name*/
@ -4889,7 +4889,7 @@ statichere PyTypeObject DBCursor_Type = {
}; };
statichere PyTypeObject DBEnv_Type = { static PyTypeObject DBEnv_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"DBEnv", /*tp_name*/ "DBEnv", /*tp_name*/
@ -4921,7 +4921,7 @@ statichere PyTypeObject DBEnv_Type = {
#endif #endif
}; };
statichere PyTypeObject DBTxn_Type = { static PyTypeObject DBTxn_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"DBTxn", /*tp_name*/ "DBTxn", /*tp_name*/
@ -4954,7 +4954,7 @@ statichere PyTypeObject DBTxn_Type = {
}; };
statichere PyTypeObject DBLock_Type = { static PyTypeObject DBLock_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"DBLock", /*tp_name*/ "DBLock", /*tp_name*/

View file

@ -83,7 +83,7 @@ typedef struct {
int strict; /* raise exception on bad CSV */ int strict; /* raise exception on bad CSV */
} DialectObj; } DialectObj;
staticforward PyTypeObject Dialect_Type; static PyTypeObject Dialect_Type;
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
@ -101,7 +101,7 @@ typedef struct {
unsigned long line_num; /* Source-file line number */ unsigned long line_num; /* Source-file line number */
} ReaderObj; } ReaderObj;
staticforward PyTypeObject Reader_Type; static PyTypeObject Reader_Type;
#define ReaderObject_Check(v) ((v)->ob_type == &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 */ int num_fields; /* number of fields in record */
} WriterObj; } WriterObj;
staticforward PyTypeObject Writer_Type; static PyTypeObject Writer_Type;
/* /*
* DIALECT class * DIALECT class

View file

@ -591,7 +591,7 @@ PointerType_set_type(PyTypeObject *self, PyObject *type)
return Py_None; return Py_None;
} }
staticforward PyObject *_byref(PyObject *); static PyObject *_byref(PyObject *);
static PyObject * static PyObject *
PointerType_from_param(PyObject *type, PyObject *value) PointerType_from_param(PyObject *type, PyObject *value)

View file

@ -267,7 +267,7 @@ typedef struct {
} ElementObject; } ElementObject;
staticforward PyTypeObject Element_Type; static PyTypeObject Element_Type;
#define Element_CheckExact(op) ((op)->ob_type == &Element_Type) #define Element_CheckExact(op) ((op)->ob_type == &Element_Type)
@ -1396,7 +1396,7 @@ static PySequenceMethods element_as_sequence = {
element_setslice, element_setslice,
}; };
statichere PyTypeObject Element_Type = { static PyTypeObject Element_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, "Element", sizeof(ElementObject), 0, 0, "Element", sizeof(ElementObject), 0,
/* methods */ /* methods */
@ -1435,7 +1435,7 @@ typedef struct {
} TreeBuilderObject; } TreeBuilderObject;
staticforward PyTypeObject TreeBuilder_Type; static PyTypeObject TreeBuilder_Type;
#define TreeBuilder_CheckExact(op) ((op)->ob_type == &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); return Py_FindMethod(treebuilder_methods, (PyObject*) self, name);
} }
statichere PyTypeObject TreeBuilder_Type = { static PyTypeObject TreeBuilder_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, "TreeBuilder", sizeof(TreeBuilderObject), 0, 0, "TreeBuilder", sizeof(TreeBuilderObject), 0,
/* methods */ /* methods */
@ -1849,7 +1849,7 @@ typedef struct {
} XMLParserObject; } XMLParserObject;
staticforward PyTypeObject XMLParser_Type; static PyTypeObject XMLParser_Type;
/* helpers */ /* helpers */
@ -2580,7 +2580,7 @@ xmlparser_getattr(XMLParserObject* self, char* name)
return res; return res;
} }
statichere PyTypeObject XMLParser_Type = { static PyTypeObject XMLParser_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, "XMLParser", sizeof(XMLParserObject), 0, 0, "XMLParser", sizeof(XMLParserObject), 0,
/* methods */ /* methods */

View file

@ -117,7 +117,7 @@ typedef struct {
#define POF_BUILTINS 0x004 #define POF_BUILTINS 0x004
#define POF_NOMEMORY 0x100 #define POF_NOMEMORY 0x100
staticforward PyTypeObject PyProfiler_Type; static PyTypeObject PyProfiler_Type;
#define PyProfiler_Check(op) PyObject_TypeCheck(op, &PyProfiler_Type) #define PyProfiler_Check(op) PyObject_TypeCheck(op, &PyProfiler_Type)
#define PyProfiler_CheckExact(op) ((op)->ob_type == &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\ is, in seconds).\n\
"); ");
statichere PyTypeObject PyProfiler_Type = { static PyTypeObject PyProfiler_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /* ob_size */ 0, /* ob_size */
"_lsprof.Profiler", /* tp_name */ "_lsprof.Profiler", /* tp_name */

View file

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

View file

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

View file

@ -53,7 +53,7 @@ typedef struct {
HANDLE handle; HANDLE handle;
} sp_handle_object; } sp_handle_object;
staticforward PyTypeObject sp_handle_type; static PyTypeObject sp_handle_type;
static PyObject* static PyObject*
sp_handle_new(HANDLE handle) sp_handle_new(HANDLE handle)
@ -127,7 +127,7 @@ sp_handle_as_int(sp_handle_object* self)
static PyNumberMethods sp_handle_as_number; static PyNumberMethods sp_handle_as_number;
statichere PyTypeObject sp_handle_type = { static PyTypeObject sp_handle_type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
0, /*ob_size*/ 0, /*ob_size*/
"_subprocess_handle", sizeof(sp_handle_object), 0, "_subprocess_handle", sizeof(sp_handle_object), 0,