dmitry Thu Sep 14 09:59:23 2006 UTC
Modified files:
/ZendEngine2 Zend.m4
/php-src/main/streams php_streams_int.h
Log:
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.m4?r1=1.61&r2=1.62&diff_format=u
Index: ZendEngine2/Zend.m4
diff -u ZendEngine2/Zend.m4:1.61 ZendEngine2/Zend.m4:1.62
--- ZendEngine2/Zend.m4:1.61 Tue Jul 18 09:08:05 2006
+++ ZendEngine2/Zend.m4 Thu Sep 14 09:59:23 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: Zend.m4,v 1.61 2006/07/18 09:08:05 dmitry Exp $
+dnl $Id: Zend.m4,v 1.62 2006/09/14 09:59:23 dmitry Exp $
dnl
dnl This file contains Zend specific autoconf functions.
dnl
@@ -161,9 +161,6 @@
AC_MSG_CHECKING([virtual machine dispatch method])
AC_MSG_RESULT($PHP_ZEND_VM)
-AC_MSG_CHECKING(whether to enable the Zend memory manager)
-AC_MSG_RESULT($ZEND_USE_ZEND_ALLOC)
-
AC_MSG_CHECKING(whether to enable thread-safety)
AC_MSG_RESULT($ZEND_MAINTAINER_ZTS)
@@ -204,12 +201,6 @@
test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
-if test "$ZEND_USE_ZEND_ALLOC" = "yes"; then
- AC_DEFINE(USE_ZEND_ALLOC,1,[Use Zend memory manager])
-else
- AC_DEFINE(USE_ZEND_ALLOC,0,[Use Zend memory manager])
-fi
-
if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
AC_DEFINE(ZTS,1,[ ])
CFLAGS="$CFLAGS -DZTS"
http://cvs.php.net/viewvc.cgi/php-src/main/streams/php_streams_int.h?r1=1.9&r2=1.10&diff_format=u
Index: php-src/main/streams/php_streams_int.h
diff -u php-src/main/streams/php_streams_int.h:1.9
php-src/main/streams/php_streams_int.h:1.10
--- php-src/main/streams/php_streams_int.h:1.9 Sat Apr 22 23:49:39 2006
+++ php-src/main/streams/php_streams_int.h Thu Sep 14 09:59:23 2006
@@ -16,25 +16,20 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams_int.h,v 1.9 2006/04/22 23:49:39 tony2001 Exp $ */
+/* $Id: php_streams_int.h,v 1.10 2006/09/14 09:59:23 dmitry Exp $ */
#if ZEND_DEBUG
-#if USE_ZEND_ALLOC
-# define emalloc_rel_orig(size) \
+#define emalloc_rel_orig(size) \
( __php_stream_call_depth == 0 \
? _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \
: _emalloc((size) ZEND_FILE_LINE_CC
ZEND_FILE_LINE_ORIG_RELAY_CC) )
-# define erealloc_rel_orig(ptr, size) \
+#define erealloc_rel_orig(ptr, size) \
( __php_stream_call_depth == 0 \
? _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC
ZEND_FILE_LINE_RELAY_CC) \
: _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC
ZEND_FILE_LINE_ORIG_RELAY_CC) )
-#else
-# define emalloc_rel_orig(size) emalloc(size)
-# define erealloc_rel_orig(ptr, size) erealloc(ptr, size)
-#endif
#define pemalloc_rel_orig(size, persistent) ((persistent) ? malloc((size))
: emalloc_rel_orig((size)))
#define perealloc_rel_orig(ptr, size, persistent) ((persistent) ?
realloc((ptr), (size)) : erealloc_rel_orig((ptr), (size)))
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
