Thanks to Stas, the functionality offered by ext/overload is now
seamlessly integrated into the Zend Engine 2.
The attached patch excludes ext/overload from Zend Engine 2 builds.
--
Sebastian Bergmann
http://sebastian-bergmann.de/ http://phpOpenTracker.de/
Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/
Index: ext/overload/overload.c
===================================================================
RCS file: /repository/php4/ext/overload/overload.c,v
retrieving revision 1.19
diff -u -r1.19 overload.c
--- ext/overload/overload.c 12 Jun 2002 16:46:24 -0000 1.19
+++ ext/overload/overload.c 4 Sep 2002 13:08:49 -0000
@@ -44,6 +44,7 @@
#include "ext/standard/info.h"
#include "php_overload.h"
+#ifndef ZEND_ENGINE_2
#if HAVE_OVERLOAD
#define GET_HANDLER "__get"
@@ -695,6 +696,7 @@
/* }}} */
#endif /* HAVE_OVERLOAD */
+#endif /* ZEND_ENGINE_2 */
/*
* Local variables:
Index: main/internal_functions_win32.c
===================================================================
RCS file: /repository/php4/main/internal_functions_win32.c,v
retrieving revision 1.64
diff -u -r1.64 internal_functions_win32.c
--- main/internal_functions_win32.c 28 Apr 2002 17:50:09 -0000 1.64
+++ main/internal_functions_win32.c 4 Sep 2002 13:08:51 -0000
@@ -82,9 +82,11 @@
#if HAVE_MBSTRING
#include "ext/mbstring/mbstring.h"
#endif
+#ifndef ZEND_ENGINE_2
#if HAVE_OVERLOAD
#include "ext/overload/php_overload.h"
#endif
+#endif
#if HAVE_TOKENIZER
#include "ext/tokenizer/php_tokenizer.h"
#endif
@@ -118,8 +120,10 @@
#if HAVE_UODBC
,phpext_odbc_ptr
#endif
+#ifndef ZEND_ENGINE_2
#if HAVE_OVERLOAD
,phpext_overload_ptr
+#endif
#endif
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
,phpext_pcre_ptr
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
