[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c

[Felipe Pena]

felipe          Sun Mar 16 21:55:47 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main       main.c 
  Log:
  Fix build (ZTS)
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.14&r2=1.640.2.23.2.57.2.15&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.14 
php-src/main/main.c:1.640.2.23.2.57.2.15
--- php-src/main/main.c:1.640.2.23.2.57.2.14    Sun Mar 16 21:06:54 2008
+++ php-src/main/main.c Sun Mar 16 21:55:46 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.14 2008/03/16 21:06:54 helly Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.15 2008/03/16 21:55:46 felipe Exp $ */
 
 /* {{{ includes
  */
@@ -1064,7 +1064,7 @@
 static void php_zend_stream_mmap_closer(void *handle TSRMLS_DC) /* {{{ */
 {
        php_stream_mmap_unmap((php_stream*)handle);
-       php_zend_stream_closer(handle);
+       php_zend_stream_closer(handle TSRMLS_CC);
 }
 /* }}} */
 
@@ -1101,7 +1101,7 @@
                memset(&handle->handle.stream.mmap, 0, 
sizeof(handle->handle.stream.mmap));
                len = php_zend_stream_fsizer(stream TSRMLS_CC) + 
ZEND_MMAP_AHEAD;
                if (php_stream_mmap_possible(stream)
-               && (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len TSRMLS_CC)) != NULL) {
+               && (p = php_stream_mmap_range(stream, 0, len, 
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
                        handle->handle.stream.closer   = 
php_zend_stream_mmap_closer;
                        handle->handle.stream.mmap.buf = p;
                        handle->handle.stream.mmap.len = mapped_len;



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