From: Felipe Pena Date: Wed, 8 Apr 2009 00:14:37 +0000 (+0000) Subject: - Fix ZTS build X-Git-Tag: php-5.4.0alpha1~191^2~3958 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=865d0f3b09006158d90b0a239950554077fdb7a0;p=php - Fix ZTS build --- diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index c6aeec5ddf..1792ac888f 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -234,7 +234,7 @@ static void print_extensions(TSRMLS_D) /* {{{ */ #define STDOUT_FILENO 1 #endif -static inline int sapi_cli_select(int fd) +static inline int sapi_cli_select(int fd TSRMLS_DC) { fd_set wfd, dfd; struct timeval tv; @@ -253,14 +253,14 @@ static inline int sapi_cli_select(int fd) return ret != -1; } -static inline size_t sapi_cli_single_write(const char *str, uint str_length) /* {{{ */ +static inline size_t sapi_cli_single_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */ { #ifdef PHP_WRITE_STDOUT long ret; do { ret = write(STDOUT_FILENO, str, str_length); - } while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO)); + } while (ret <= 0 && errno == EAGAIN && sapi_cli_select(STDOUT_FILENO TSRMLS_CC)); if (ret <= 0) { return 0; @@ -291,7 +291,7 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ while (remaining > 0) { - ret = sapi_cli_single_write(ptr, remaining); + ret = sapi_cli_single_write(ptr, remaining TSRMLS_CC); if (!ret) { #ifndef PHP_CLI_WIN32_NO_CONSOLE php_handle_aborted_connection(); @@ -1173,7 +1173,7 @@ int main(int argc, char *argv[]) pos = 0; if (php_last_char != '\0' && php_last_char != '\n') { - sapi_cli_single_write("\n", 1); + sapi_cli_single_write("\n", 1 TSRMLS_CC); } if (EG(exception)) {