helly Thu Nov 17 18:20:40 2005 EDT Modified files: /php-src/sapi/cli php_cli.c Log: - Reflection was moved into its own extension http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.137&r2=1.138&ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.137 php-src/sapi/cli/php_cli.c:1.138 --- php-src/sapi/cli/php_cli.c:1.137 Thu Nov 17 03:36:11 2005 +++ php-src/sapi/cli/php_cli.c Thu Nov 17 18:20:39 2005 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.137 2005/11/17 08:36:11 sniper Exp $ */ +/* $Id: php_cli.c,v 1.138 2005/11/17 23:20:39 helly Exp $ */ #include "php.h" #include "php_globals.h" @@ -28,7 +28,10 @@ #include "zend_hash.h" #include "zend_modules.h" #include "zend_interfaces.h" -#include "zend_reflection_api.h" + +#ifdef HAVE_REFLECTION +#include "ext/reflection/php_reflection.h" +#endif #include "SAPI.h" @@ -133,8 +136,10 @@ {'?', 0, "usage"},/* help alias (both '?' and 'usage') */ {'v', 0, "version"}, {'z', 1, "zend-extension"}, +#ifdef HAVE_REFLECTION {10, 1, "rclass"}, {11, 1, "rextension"}, +#endif {'-', 0, NULL} /* end of args */ }; @@ -567,7 +572,9 @@ zend_file_handle file_handle; /* temporary locals */ int behavior=PHP_MODE_STANDARD; +#ifdef HAVE_REFLECTION char *reflection_what; +#endif int orig_optind=php_optind; char *orig_optarg=php_optarg; char *arg_free=NULL, **arg_excp=&arg_free; @@ -913,6 +920,7 @@ hide_argv = 1; break; +#ifdef HAVE_REFLECTION case 10: behavior=PHP_MODE_REFLECTION_CLASS; reflection_what = php_optarg; @@ -921,7 +929,7 @@ behavior=PHP_MODE_REFLECTION_EXTENSION; reflection_what = php_optarg; break; - +#endif default: break; } @@ -1155,6 +1163,7 @@ } break; +#ifdef HAVE_REFLECTION case PHP_MODE_REFLECTION_CLASS: case PHP_MODE_REFLECTION_EXTENSION: { @@ -1205,6 +1214,7 @@ break; } +#endif /* reflection */ } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php