felipe          Wed Apr  8 00:16:50 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cli   php_cli.c 
  Log:
  - MFH: Fix ZTS build
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.31&r2=1.129.2.13.2.32&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.31 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.32
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.31  Tue Apr  7 16:11:57 2009
+++ php-src/sapi/cli/php_cli.c  Wed Apr  8 00:16:50 2009
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.31 2009/04/07 16:11:57 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.32 2009/04/08 00:16:50 felipe Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -230,7 +230,7 @@
 #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;
@@ -249,14 +249,14 @@
        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;
@@ -287,7 +287,7 @@
 
        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();
@@ -1143,7 +1143,7 @@
                                        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)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to