mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: fix constants availability fix size_t signed comparison
This commit is contained in:
commit
0091d81668
@ -106,7 +106,8 @@ static size_t readline_shell_ub_write(const char *str, size_t str_length) /* {{{
|
||||
caller (sapi_cli_single_write in sapi/cli) which will actually
|
||||
write due to -1 return code */
|
||||
php_last_char = str[str_length-1];
|
||||
return -1;
|
||||
|
||||
return (size_t) -1;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
@ -262,19 +262,19 @@ PHP_MINIT_FUNCTION(file)
|
||||
REGISTER_LONG_CONSTANT("STREAM_IPPROTO_IP", IPPROTO_IP, CONST_CS|CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
#ifdef IPPROTO_TCP
|
||||
#if defined(IPPROTO_TCP) || defined(PHP_WIN32)
|
||||
REGISTER_LONG_CONSTANT("STREAM_IPPROTO_TCP", IPPROTO_TCP, CONST_CS|CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
#ifdef IPPROTO_UDP
|
||||
#if defined(IPPROTO_UDP) || defined(PHP_WIN32)
|
||||
REGISTER_LONG_CONSTANT("STREAM_IPPROTO_UDP", IPPROTO_UDP, CONST_CS|CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
#ifdef IPPROTO_ICMP
|
||||
#if defined(IPPROTO_ICMP) || defined(PHP_WIN32)
|
||||
REGISTER_LONG_CONSTANT("STREAM_IPPROTO_ICMP", IPPROTO_ICMP, CONST_CS|CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
#ifdef IPPROTO_RAW
|
||||
#if defined(IPPROTO_RAW) || defined(PHP_WIN32)
|
||||
REGISTER_LONG_CONSTANT("STREAM_IPPROTO_RAW", IPPROTO_RAW, CONST_CS|CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
|
@ -304,7 +304,7 @@ static size_t sapi_cli_ub_write(const char *str, size_t str_length) /* {{{ */
|
||||
if (cli_shell_callbacks.cli_shell_ub_write) {
|
||||
size_t ub_wrote;
|
||||
ub_wrote = cli_shell_callbacks.cli_shell_ub_write(str, str_length);
|
||||
if (ub_wrote != (size_t)-1) {
|
||||
if (ub_wrote != (size_t) -1) {
|
||||
return ub_wrote;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user