cvs: pear /PECL/python pip_convert.c pip_convert.h python.c python.dsp

sebastian Sat Dec 14 18:29:40 2002 EDT Modified files: /pear/PECL/python pip_convert.c pip_convert.h python.c python.dsp Log: Add pip_convert.{c|h} to MSVC project file. Index: pear/PECL/python/pip_convert.c diff -u pear/PECL/python/pip_convert.c:1.7 pear/PECL/python/pip_convert.c:1.8 --- pear/PECL/python/pip_convert.c:1.7 Sun Nov 17 19:43:33 2002 +++ pear/PECL/python/pip_convert.c Sat Dec 14 18:29:40 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pip_convert.c,v 1.7 2002/11/18 00:43:33 jon Exp $ */ +/* $Id: pip_convert.c,v 1.8 2002/12/14 23:29:40 sebastian Exp $ */ #include "pip_convert.h" @@ -379,7 +379,7 @@ /* {{{ pip_args_to_tuple(int argc, int start) Converts PHP arguments into a Python tuple suitable for argument passing */ -PyObject * pip_args_to_tuple(int argc, int start) +PyObject * pip_args_to_tuple(int argc, int start TSRMLS_DC) { zval ***zargs = NULL; PyObject *args = NULL; @@ -414,7 +414,7 @@ /* {{{ pip_args_to_tuple_ex(int ht, int argc, int start) Converts PHP arguments into a Python tuple suitable for argument passing */ -PyObject * pip_args_to_tuple_ex(int ht, int argc, int start) +PyObject * pip_args_to_tuple_ex(int ht, int argc, int start TSRMLS_DC) { zval **zargs = NULL; PyObject *args = NULL; Index: pear/PECL/python/pip_convert.h diff -u pear/PECL/python/pip_convert.h:1.3 pear/PECL/python/pip_convert.h:1.4 --- pear/PECL/python/pip_convert.h:1.3 Sun Nov 17 19:43:33 2002 +++ pear/PECL/python/pip_convert.h Sat Dec 14 18:29:40 2002 @@ -38,8 +38,8 @@ zval * pip_pyobject_to_zval(PyObject *obj); /* Arguments */ -PyObject * pip_args_to_tuple(int argc, int start); -PyObject * pip_args_to_tuple_ex(int ht, int argc, int start); +PyObject * pip_args_to_tuple(int argc, int start TSRMLS_DC); +PyObject * pip_args_to_tuple_ex(int ht, int argc, int start TSRMLS_DC); /* Object Representations */ Index: pear/PECL/python/python.c diff -u pear/PECL/python/python.c:1.16 pear/PECL/python/python.c:1.17 --- pear/PECL/python/python.c:1.16 Sun Nov 17 19:01:49 2002 +++ pear/PECL/python/python.c Sat Dec 14 18:29:40 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: python.c,v 1.16 2002/11/18 00:01:49 jon Exp $ */ +/* $Id: python.c,v 1.17 2002/12/14 23:29:40 sebastian Exp $ */ /* * TODO: @@ -292,7 +292,7 @@ zval *handle; /* Create a new Python object by calling the constructor */ - args = pip_args_to_tuple(argc, 2); + args = pip_args_to_tuple(argc, 2 TSRMLS_CC); obj = PyObject_CallObject(item, args); if (args) { Py_DECREF(args); @@ -630,7 +630,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Python Support", "enabled"); php_info_print_table_row(2, "Python Version", Py_GetVersion()); - php_info_print_table_row(2, "Extension Version", "$Revision: 1.16 $"); + php_info_print_table_row(2, "Extension Version", "$Revision: 1.17 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -793,7 +793,7 @@ PyObject *args = NULL, *result = NULL; /* Call the function with a tuple of arguments */ - args = pip_args_to_tuple(argc, 2); + args = pip_args_to_tuple(argc, 2 TSRMLS_CC); result = PyObject_CallObject(function, args); Py_DECREF(function); Index: pear/PECL/python/python.dsp diff -u pear/PECL/python/python.dsp:1.2 pear/PECL/python/python.dsp:1.3 --- pear/PECL/python/python.dsp:1.2 Sun Nov 3 12:55:09 2002 +++ pear/PECL/python/python.dsp Sat Dec 14 18:29:40 2002 @@ -95,6 +95,10 @@ SOURCE=.\python.c # End Source File +# Begin Source File + +SOURCE=.\pip_convert.c +# End Source File # End Group # Begin Group "Header Files" @@ -102,6 +106,10 @@ # Begin Source File SOURCE=.\php_python.h +# End Source File +# Begin Source File + +SOURCE=.\pip_convert.h # End Source File # End Group # End Target