php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source 
* PHP-7.2:
  Fix proto documents for new global functions
This commit is contained in:
Joe Watkins
2017-11-06 07:24:51 +00:00
parent 18c833504f 5cdf37e603
commit 21e4ab1977
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mbstring/mbstring.c
+3 -3
View File
@@ -4863,7 +4863,7 @@ static inline zend_long php_mb_ord(const char* str, size_t str_len, const char*
}
/* {{{ proto bool mb_ord([string str[, string encoding]]) */
/* {{{ proto int|false mb_ord([string str[, string encoding]]) */
PHP_FUNCTION(mb_ord)
{
char* str;
@@ -4973,7 +4973,7 @@ static inline zend_string *php_mb_chr(zend_long cp, const char *enc_name)
}
/* {{{ proto bool mb_ord([int cp[, string encoding]]) */
/* {{{ proto string|false mb_chr([int cp[, string encoding]]) */
PHP_FUNCTION(mb_chr)
{
zend_long cp;
@@ -5005,7 +5005,7 @@ static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_enc
}
/* {{{ proto bool mb_scrub([string str[, string encoding]]) */
/* {{{ proto string|false mb_scrub([string str[, string encoding]]) */
PHP_FUNCTION(mb_scrub)
{
const mbfl_encoding *enc;
ext/standard/streamsfuncs.c
+2 -2
View File
@@ -1618,7 +1618,7 @@ PHP_FUNCTION(stream_supports_lock)
RETURN_TRUE;
}
/* {{{ proto proto stream_isatty(resource stream)
/* {{{ proto bool stream_isatty(resource stream)
Check if a stream is a TTY.
*/
PHP_FUNCTION(stream_isatty)
@@ -1656,7 +1656,7 @@ PHP_FUNCTION(stream_isatty)
}
#ifdef PHP_WIN32
/* {{{ proto proto sapi_windows_vt100_support(resource stream[, bool enable])
/* {{{ proto bool sapi_windows_vt100_support(resource stream[, bool enable])
Get or set VT100 support for the specified stream associated to an
output buffer of a Windows console.
*/