From 85f961bdb4b1904170fe632f8a5a6ef90e64b573 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Sun, 20 Jul 2003 23:06:59 +0000 Subject: Some manipulations of the keyword 'static' to get blender to compile --- source/blender/python/api2_2x/BezTriple.c | 18 +++++++++--------- source/blender/python/api2_2x/BezTriple.h | 22 +++++++++++----------- source/blender/python/api2_2x/Ipocurve.c | 20 ++++++++++---------- source/blender/python/api2_2x/Ipocurve.h | 30 +++++++++++++++--------------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/source/blender/python/api2_2x/BezTriple.c b/source/blender/python/api2_2x/BezTriple.c index ec8564f72c9..1f951b8a668 100644 --- a/source/blender/python/api2_2x/BezTriple.c +++ b/source/blender/python/api2_2x/BezTriple.c @@ -35,7 +35,7 @@ /* Function: M_BezTriple_New */ /* Python equivalent: Blender.BezTriple.New */ /*****************************************************************************/ -static PyObject *M_BezTriple_New(PyObject *self, PyObject *args) +PyObject *M_BezTriple_New(PyObject *self, PyObject *args) { return 0; } @@ -48,7 +48,7 @@ static PyObject *M_BezTriple_New(PyObject *self, PyObject *args) /* passed in, a list of all ipo data names in the */ /* current scene is returned. */ /*****************************************************************************/ -static PyObject *M_BezTriple_Get(PyObject *self, PyObject *args) +PyObject *M_BezTriple_Get(PyObject *self, PyObject *args) { return 0; } @@ -57,12 +57,12 @@ static PyObject *M_BezTriple_Get(PyObject *self, PyObject *args) /*****************************************************************************/ /* Python C_BezTriple methods: */ /*****************************************************************************/ -static PyObject *BezTriple_getName(C_BezTriple *self) +PyObject *BezTriple_getName(C_BezTriple *self) { return 0; } -static PyObject *BezTriple_setName(C_BezTriple *self, PyObject *args) +PyObject *BezTriple_setName(C_BezTriple *self, PyObject *args) { return 0; } @@ -73,12 +73,12 @@ static PyObject *BezTriple_setName(C_BezTriple *self, PyObject *args) /* Description: This is a callback function for the C_BezTriple type. It is */ /* the destructor function. */ /*****************************************************************************/ -static void BezTripleDeAlloc (C_BezTriple *self) +void BezTripleDeAlloc (C_BezTriple *self) { PyObject_DEL (self); } -static PyObject* BezTriple_getPoints (C_BezTriple *self) +PyObject* BezTriple_getPoints (C_BezTriple *self) { struct BezTriple *bezt = self->beztriple; PyObject* l = PyList_New(0); @@ -108,7 +108,7 @@ int BezTriple_setPoints (C_BezTriple *self,PyObject *value) /* the function that accesses C_BezTriple "member variables" and */ /* methods. */ /*****************************************************************************/ -static PyObject *BezTripleGetAttr (C_BezTriple *self, char *name) +PyObject *BezTripleGetAttr (C_BezTriple *self, char *name) { if (strcmp (name, "pt") == 0)return BezTriple_getPoints(self); return Py_FindMethod(C_BezTriple_methods, (PyObject *)self, name); @@ -119,7 +119,7 @@ if (strcmp (name, "pt") == 0)return BezTriple_getPoints(self); /* Description: This is a callback function for the C_BezTriple type. It is the */ /* function that sets BezTriple Data attributes (member variables).*/ /*****************************************************************************/ -static int BezTripleSetAttr (C_BezTriple *self, char *name, PyObject *value) +int BezTripleSetAttr (C_BezTriple *self, char *name, PyObject *value) { if (strcmp (name, "pt") == 0)return BezTriple_setPoints(self,value); return 0; /* normal exit */ @@ -130,7 +130,7 @@ if (strcmp (name, "pt") == 0)return BezTriple_setPoints(self,value); /* Description: This is a callback function for the C_BezTriple type. It */ /* builds a meaninful string to represent BezTriple objects. */ /*****************************************************************************/ -static PyObject *BezTripleRepr (C_BezTriple *self) +PyObject *BezTripleRepr (C_BezTriple *self) { return PyString_FromString("[BezTriple]"); } diff --git a/source/blender/python/api2_2x/BezTriple.h b/source/blender/python/api2_2x/BezTriple.h index c7c4b6e1dc4..abd677f1735 100644 --- a/source/blender/python/api2_2x/BezTriple.h +++ b/source/blender/python/api2_2x/BezTriple.h @@ -49,8 +49,8 @@ /*****************************************************************************/ /* Python API function prototypes for the BezTriple module. */ /*****************************************************************************/ -static PyObject *M_BezTriple_New (PyObject *self, PyObject *args); -static PyObject *M_BezTriple_Get (PyObject *self, PyObject *args); +PyObject *M_BezTriple_New (PyObject *self, PyObject *args); +PyObject *M_BezTriple_Get (PyObject *self, PyObject *args); @@ -58,7 +58,7 @@ static PyObject *M_BezTriple_Get (PyObject *self, PyObject *args); /* Python method structure definition for Blender.BezTriple module: */ /*****************************************************************************/ -struct PyMethodDef M_BezTriple_methods[] = { +static struct PyMethodDef M_BezTriple_methods[] = { {"New",(PyCFunction)M_BezTriple_New, METH_VARARGS|METH_KEYWORDS,0}, {"Get", M_BezTriple_Get, METH_VARARGS, 0}, {"get", M_BezTriple_Get, METH_VARARGS, 0}, @@ -76,8 +76,8 @@ typedef struct { /*****************************************************************************/ /* Python C_BezTriple methods declarations: */ /*****************************************************************************/ -static PyObject *BezTriple_getName(C_BezTriple *self); -static PyObject *BezTriple_setName(C_BezTriple *self, PyObject *args); +PyObject *BezTriple_getName(C_BezTriple *self); +PyObject *BezTriple_setName(C_BezTriple *self, PyObject *args); /*****************************************************************************/ /* Python C_BezTriple methods table: */ @@ -94,16 +94,16 @@ static PyMethodDef C_BezTriple_methods[] = { /*****************************************************************************/ /* Python BezTriple_Type callback function prototypes: */ /*****************************************************************************/ -static void BezTripleDeAlloc (C_BezTriple *self); -//static int BezTriplePrint (C_BezTriple *self, FILE *fp, int flags); -static int BezTripleSetAttr (C_BezTriple *self, char *name, PyObject *v); -static PyObject *BezTripleGetAttr (C_BezTriple *self, char *name); -static PyObject *BezTripleRepr (C_BezTriple *self); +void BezTripleDeAlloc (C_BezTriple *self); +//int BezTriplePrint (C_BezTriple *self, FILE *fp, int flags); +int BezTripleSetAttr (C_BezTriple *self, char *name, PyObject *v); +PyObject *BezTripleGetAttr (C_BezTriple *self, char *name); +PyObject *BezTripleRepr (C_BezTriple *self); /*****************************************************************************/ /* Python BezTriple_Type structure definition: */ /*****************************************************************************/ -PyTypeObject BezTriple_Type = +static PyTypeObject BezTriple_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ diff --git a/source/blender/python/api2_2x/Ipocurve.c b/source/blender/python/api2_2x/Ipocurve.c index 7a329fce2b1..50356103190 100644 --- a/source/blender/python/api2_2x/Ipocurve.c +++ b/source/blender/python/api2_2x/Ipocurve.c @@ -35,7 +35,7 @@ /* Function: M_IpoCurve_New */ /* Python equivalent: Blender.IpoCurve.New */ /*****************************************************************************/ -static PyObject *M_IpoCurve_New(PyObject *self, PyObject *args) +PyObject *M_IpoCurve_New(PyObject *self, PyObject *args) { return 0; } @@ -63,7 +63,7 @@ PyObject *IpoCurve_Init (void) /* passed in, a list of all ipo data names in the */ /* current scene is returned. */ /*****************************************************************************/ -static PyObject *M_IpoCurve_Get(PyObject *self, PyObject *args) +PyObject *M_IpoCurve_Get(PyObject *self, PyObject *args) { return 0; } @@ -73,19 +73,19 @@ static PyObject *M_IpoCurve_Get(PyObject *self, PyObject *args) /* Python C_IpoCurve methods: */ /*****************************************************************************/ -static PyObject *IpoCurve_setName(C_IpoCurve *self, PyObject *args) +PyObject *IpoCurve_setName(C_IpoCurve *self, PyObject *args) { return 0; } -static PyObject *IpoCurve_Recalc(C_IpoCurve *self) +PyObject *IpoCurve_Recalc(C_IpoCurve *self) { void testhandles_ipocurve(IpoCurve *icu); IpoCurve *icu = self->ipocurve; testhandles_ipocurve(icu); } -static PyObject* IpoCurve_getName (C_IpoCurve *self) +PyObject* IpoCurve_getName (C_IpoCurve *self) { char * nametab[24] = {"LocX","LocY","LocZ","dLocX","dLocY","dLocZ","RotX","RotY","RotZ","dRotX","dRotY","dRotZ","SizeX","SizeY","SizeZ","dSizeX","dSizeY","dSizeZ","Layer","Time","ColR","ColG","ColB","ColA"}; @@ -101,12 +101,12 @@ return PyString_FromString(nametab[self->ipocurve->adrcode-1]); -static void IpoCurveDeAlloc (C_IpoCurve *self) +void IpoCurveDeAlloc (C_IpoCurve *self) { PyObject_DEL (self); } -static PyObject* IpoCurve_getPoints (C_IpoCurve *self) +PyObject* IpoCurve_getPoints (C_IpoCurve *self) { struct BezTriple *bezt; PyObject* l = PyList_New(0); @@ -141,7 +141,7 @@ struct BezTriple *bezt; /* the function that accesses C_IpoCurve "member variables" and */ /* methods. */ /*****************************************************************************/ -static PyObject *IpoCurveGetAttr (C_IpoCurve *self, char *name) +PyObject *IpoCurveGetAttr (C_IpoCurve *self, char *name) { if (strcmp (name, "bezierPoints") == 0)return IpoCurve_getPoints(self); if (strcmp (name, "name") == 0)return IpoCurve_getName(self); @@ -153,7 +153,7 @@ if (strcmp (name, "name") == 0)return IpoCurve_getName(self); /* Description: This is a callback function for the C_IpoCurve type. It is the */ /* function that sets IpoCurve Data attributes (member variables).*/ /*****************************************************************************/ -static int IpoCurveSetAttr (C_IpoCurve *self, char *name, PyObject *value) +int IpoCurveSetAttr (C_IpoCurve *self, char *name, PyObject *value) { if (strcmp (name, "bezierPoints") == 0)return IpoCurve_setPoints(self,value); return 0; /* normal exit */ @@ -164,7 +164,7 @@ if (strcmp (name, "bezierPoints") == 0)return IpoCurve_setPoints(self,value); /* Description: This is a callback function for the C_IpoCurve type. It */ /* builds a meaninful string to represent ipo objects. */ /*****************************************************************************/ -static PyObject *IpoCurveRepr (C_IpoCurve *self) +PyObject *IpoCurveRepr (C_IpoCurve *self) { char s[1024]; sprintf(s,"IpoCurve %d %d %d %d %d %d %d %d \n",self->ipocurve->blocktype,self->ipocurve->adrcode,self->ipocurve->vartype,self->ipocurve->totvert,self->ipocurve->ipo,self->ipocurve->extrap,self->ipocurve->flag,self->ipocurve->rt); diff --git a/source/blender/python/api2_2x/Ipocurve.h b/source/blender/python/api2_2x/Ipocurve.h index cc15c9aae9d..332e25e6589 100644 --- a/source/blender/python/api2_2x/Ipocurve.h +++ b/source/blender/python/api2_2x/Ipocurve.h @@ -49,24 +49,24 @@ /*****************************************************************************/ /* Python API function prototypes for the IpoCurve module. */ /*****************************************************************************/ -static PyObject *M_IpoCurve_New (PyObject *self, PyObject *args); -static PyObject *M_IpoCurve_Get (PyObject *self, PyObject *args); +PyObject *M_IpoCurve_New (PyObject *self, PyObject *args); +PyObject *M_IpoCurve_Get (PyObject *self, PyObject *args); /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ /* In Python these will be written to the console when doing a */ /* Blender.IpoCurve.__doc__ */ /*****************************************************************************/ -char M_IpoCurve_doc[] = ""; -char M_IpoCurve_New_doc[] =""; -char M_IpoCurve_Get_doc[] =""; +static char M_IpoCurve_doc[] = ""; +static char M_IpoCurve_New_doc[] =""; +static char M_IpoCurve_Get_doc[] =""; /*****************************************************************************/ /* Python method structure definition for Blender.IpoCurve module: */ /*****************************************************************************/ -struct PyMethodDef M_IpoCurve_methods[] = { +static struct PyMethodDef M_IpoCurve_methods[] = { {"New",(PyCFunction)M_IpoCurve_New, METH_VARARGS|METH_KEYWORDS,M_IpoCurve_New_doc}, {"Get", M_IpoCurve_Get, METH_VARARGS, M_IpoCurve_Get_doc}, {"get", M_IpoCurve_Get, METH_VARARGS, M_IpoCurve_Get_doc}, @@ -84,9 +84,9 @@ typedef struct { /*****************************************************************************/ /* Python C_IpoCurve methods declarations: */ /*****************************************************************************/ -static PyObject *IpoCurve_getName(C_IpoCurve *self); -static PyObject *IpoCurve_Recalc(C_IpoCurve *self); -static PyObject *IpoCurve_setName(C_IpoCurve *self, PyObject *args); +PyObject *IpoCurve_getName(C_IpoCurve *self); +PyObject *IpoCurve_Recalc(C_IpoCurve *self); +PyObject *IpoCurve_setName(C_IpoCurve *self, PyObject *args); /*****************************************************************************/ /* Python C_IpoCurve methods table: */ @@ -105,16 +105,16 @@ static PyMethodDef C_IpoCurve_methods[] = { /*****************************************************************************/ /* Python IpoCurve_Type callback function prototypes: */ /*****************************************************************************/ -static void IpoCurveDeAlloc (C_IpoCurve *self); -//static int IpoCurvePrint (C_IpoCurve *self, FILE *fp, int flags); -static int IpoCurveSetAttr (C_IpoCurve *self, char *name, PyObject *v); -static PyObject *IpoCurveGetAttr (C_IpoCurve *self, char *name); -static PyObject *IpoCurveRepr (C_IpoCurve *self); +void IpoCurveDeAlloc (C_IpoCurve *self); +//int IpoCurvePrint (C_IpoCurve *self, FILE *fp, int flags); +int IpoCurveSetAttr (C_IpoCurve *self, char *name, PyObject *v); +PyObject *IpoCurveGetAttr (C_IpoCurve *self, char *name); +PyObject *IpoCurveRepr (C_IpoCurve *self); /*****************************************************************************/ /* Python IpoCurve_Type structure definition: */ /*****************************************************************************/ -PyTypeObject IpoCurve_Type = +static PyTypeObject IpoCurve_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ -- cgit v1.2.3