From: Xinchen Hui <laruence@php.net>
Date: Wed, 5 Sep 2012 15:11:19 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~36^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d44ff640c1def1dc05b298dab77b2d2c9da2f38;p=php

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	ext/interbase/interbase.rc
---

9d44ff640c1def1dc05b298dab77b2d2c9da2f38
diff --cc ext/standard/url_scanner_ex.c
index d883d4dfa3,943242f343..c7e4a38d28
--- 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 2c069c4491,0000000000..3e9ca43084
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          |
 +  | license@php.net so we can mail you a copy immediately.               |
 +  +----------------------------------------------------------------------+
 +  | Author: Johannes Schlueter <johannes@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
 + */