Commit: 9d44ff640c1def1dc05b298dab77b2d2c9da2f38 Author: Xinchen Hui <larue...@php.net> Wed, 5 Sep 2012 23:11:19 +0800 Parents: 954e7a3b3ca115b619b1b326ae4ae31a7cf196db d64d9e335147173507d39c759c54320e2c20c9ed Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d44ff640c1def1dc05b298dab77b2d2c9da2f38 Log: Merge branch 'PHP-5.3' into PHP-5.4 Conflicts: ext/interbase/interbase.rc Changed paths: MM ext/date/lib/parse_date.c MM ext/date/lib/parse_iso_intervals.c MM ext/dba/libflatfile/flatfile.c MM ext/dba/libinifile/inifile.c MM ext/standard/url_scanner_ex.c MA sapi/cli/cli.h MM sapi/fpm/fpm/fpm_main.c Diff: diff --cc ext/standard/url_scanner_ex.c index d883d4d,943242f..c7e4a38 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@@ -2,9 -2,9 +2,9 @@@ #line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 6 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2006 The PHP Group | + | Copyright (c) 1997-2012 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --cc sapi/cli/cli.h index 2c069c4,0000000..3e9ca43 mode 100644,000000..100644 --- a/sapi/cli/cli.h +++ b/sapi/cli/cli.h @@@ -1,52 -1,0 +1,52 @@@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ - | Copyright (c) 1997-2010 The PHP Group | ++ | Copyright (c) 1997-2012 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | lice...@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Johannes Schlueter <johan...@php.net> | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef CLI_H +#define CLI_H + +#ifdef PHP_WIN32 +# define PHP_CLI_API __declspec(dllexport) +#elif defined(__GNUC__) && __GNUC__ >= 4 +# define PHP_CLI_API __attribute__ ((visibility("default"))) +#else +# define PHP_CLI_API +#endif + + +extern PHP_CLI_API size_t sapi_cli_single_write(const char *str, uint str_length TSRMLS_DC); + +typedef struct { + size_t (*cli_shell_write)(const char *str, uint str_length TSRMLS_DC); + int (*cli_shell_ub_write)(const char *str, uint str_length TSRMLS_DC); + int (*cli_shell_run)(TSRMLS_D); +} cli_shell_callbacks_t; + +extern PHP_CLI_API cli_shell_callbacks_t *php_cli_get_shell_callbacks(); + +#endif /* CLI_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
