[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_stream.c trunk/Zend/zend_stream.c

[Pierre Joye]

pajoye                                   Sun, 06 Jun 2010 12:32:25 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300225

Log:
- label only used when mmap is available

Changed paths:
    U   php/php-src/branches/PHP_5_3/Zend/zend_stream.c
    U   php/php-src/trunk/Zend/zend_stream.c

Modified: php/php-src/branches/PHP_5_3/Zend/zend_stream.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_stream.c     2010-06-06 11:20:55 UTC 
(rev 300224)
+++ php/php-src/branches/PHP_5_3/Zend/zend_stream.c     2010-06-06 12:32:25 UTC 
(rev 300225)
@@ -269,7 +269,9 @@
                memset(file_handle->handle.stream.mmap.buf + 
file_handle->handle.stream.mmap.len, 0, ZEND_MMAP_AHEAD);
        }

+#if HAVE_MMAP
 return_mapped:
+#endif
        file_handle->type = ZEND_HANDLE_MAPPED;
        file_handle->handle.stream.mmap.pos        = 0;
        file_handle->handle.stream.mmap.old_handle = 
file_handle->handle.stream.handle;

Modified: php/php-src/trunk/Zend/zend_stream.c
===================================================================
--- php/php-src/trunk/Zend/zend_stream.c        2010-06-06 11:20:55 UTC (rev 
300224)
+++ php/php-src/trunk/Zend/zend_stream.c        2010-06-06 12:32:25 UTC (rev 
300225)
@@ -268,8 +268,9 @@
        if (ZEND_MMAP_AHEAD) {
                memset(file_handle->handle.stream.mmap.buf + 
file_handle->handle.stream.mmap.len, 0, ZEND_MMAP_AHEAD);
        }
-
+#if HAVE_MMAP
 return_mapped:
+#endif
        file_handle->type = ZEND_HANDLE_MAPPED;
        file_handle->handle.stream.mmap.pos        = 0;
        file_handle->handle.stream.mmap.old_handle = 
file_handle->handle.stream.handle;


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