cvs: php4 /ext/overload overload.c /main internal_functions_win32.c
| From: | Sebastian Bergmann | Date: | Wed, 04 Sep 2002 13:55:52 +0000 |
| Subject: | cvs: php4 /ext/overload overload.c /main internal_functions_win32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13826@lists.php.net to get a copy of this message | ||
sebastian Wed Sep 4 09:55:52 2002 EDT
Modified files:
/php4/main internal_functions_win32.c
/php4/ext/overload overload.c
Log:
Don't build ext/overload with Zend Engine 2.
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.64 php4/main/internal_functions_win32.c:1.65
--- php4/main/internal_functions_win32.c:1.64 Sun Apr 28 13:50:09 2002
+++ php4/main/internal_functions_win32.c Wed Sep 4 09:55:52 2002
@@ -16,7 +16,7 @@
| Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
- $Id: internal_functions_win32.c,v 1.64 2002/04/28 17:50:09 sebastian Exp $
+ $Id: internal_functions_win32.c,v 1.65 2002/09/04 13:55:52 sebastian Exp $
*/
/* {{{ includes
@@ -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
Index: php4/ext/overload/overload.c
diff -u php4/ext/overload/overload.c:1.19 php4/ext/overload/overload.c:1.20
--- php4/ext/overload/overload.c:1.19 Wed Jun 12 12:46:24 2002
+++ php4/ext/overload/overload.c Wed Sep 4 09:55:52 2002
@@ -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: