diff options
Diffstat (limited to 'Modules/cgensupport.h')
| -rw-r--r-- | Modules/cgensupport.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Modules/cgensupport.h b/Modules/cgensupport.h index fe02da2..bb7cbbc 100644 --- a/Modules/cgensupport.h +++ b/Modules/cgensupport.h @@ -32,16 +32,16 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. typedef char *string; -#define mknewlongobject(x) newintobject(x) -#define mknewshortobject(x) newintobject((long)x) -#define mknewfloatobject(x) newfloatobject(x) -#define mknewcharobject(ch) mkvalue("c", ch) - -extern int getiobjectarg PROTO((object *args, int nargs, int i, object **p_a)); -extern int getilongarg PROTO((object *args, int nargs, int i, long *p_a)); -extern int getishortarg PROTO((object *args, int nargs, int i, short *p_a)); -extern int getifloatarg PROTO((object *args, int nargs, int i, float *p_a)); -extern int getistringarg PROTO((object *args, int nargs, int i, string *p_a)); +#define mknewlongobject(x) PyInt_FromLong(x) +#define mknewshortobject(x) PyInt_FromLong((long)x) +#define mknewfloatobject(x) PyFloat_FromDouble(x) +#define mknewcharobject(ch) Py_BuildValue("c", ch) + +extern int PyArg_GetObject Py_PROTO((PyObject *args, int nargs, int i, PyObject **p_a)); +extern int PyArg_GetLong Py_PROTO((PyObject *args, int nargs, int i, long *p_a)); +extern int PyArg_GetShort Py_PROTO((PyObject *args, int nargs, int i, short *p_a)); +extern int PyArg_GetFloat Py_PROTO((PyObject *args, int nargs, int i, float *p_a)); +extern int PyArg_GetString Py_PROTO((PyObject *args, int nargs, int i, string *p_a)); #ifdef __cplusplus } |