summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@php.net>2002-09-04 13:55:52 +0000
committerSebastian Bergmann <sebastian@php.net>2002-09-04 13:55:52 +0000
commit419321979d0db297ca5452202977b93d808b0617 (patch)
tree76f466acb9dcf4dbe05d7a3f437a6249e3698eaa
parente5324723d0b33d05a3b2e53048cdecc033468170 (diff)
downloadphp-git-419321979d0db297ca5452202977b93d808b0617.tar.gz
Don't build ext/overload with Zend Engine 2.
-rw-r--r--ext/overload/overload.c2
-rw-r--r--main/internal_functions_win32.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ext/overload/overload.c b/ext/overload/overload.c
index 41b1e2f6d8..e8309d4af8 100644
--- a/ext/overload/overload.c
+++ b/ext/overload/overload.c
@@ -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 @@ PHP_FUNCTION(overload)
/* }}} */
#endif /* HAVE_OVERLOAD */
+#endif /* ZEND_ENGINE_2 */
/*
* Local variables:
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 0205f5763a..1d49999f55 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -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,9 +120,11 @@ zend_module_entry *php_builtin_extensions[] = {
#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
#endif