More portability stuff

diff --git a/Zend/configure.in b/Zend/configure.in
index 315f6ce1f40cba1253d34e087976c77fbaee327c..56bfc20dfb449588f9d76f600d4059e28d51749a 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -159,7 +159,9 @@ if test "$enable_thread_safety" = "yes" ; then
 AC_CHECK_LIB(C, cin)
 AC_CHECK_LIB(g++, cin)
 AC_CHECK_LIB(stdc++, cin)
+dnl Digital Unix 4.0
 AC_CHECK_LIB(cxx, cin)
+AC_CHECK_LIB(cxxstd, __array_delete)
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS

diff --git a/Zend/zend.h b/Zend/zend.h
index 4b8491186c64d951070bba090f9f45a6f1109ace..9e190e46412fd3fb097299ed02cbdeb17e3e7a0c 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -151,6 +151,8 @@ typedef struct _zend_overloaded_element {
        zval element;
 } zend_overloaded_element;
 
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
 
 struct _zend_class_entry {
        char type;

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index ea740e107d5e3d753619669fbeb0dfb42145caf2..2a7ceeb6a9a0abc1eef2c02af0d46bf2061cfa93 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -55,6 +55,9 @@ END_EXTERN_C()
 #include "zend_compile.h"
 #include "zend_execute.h"
 
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
+       
 struct _zend_compiler_globals {
        zend_stack bp_stack;
        zend_stack switch_cond_stack;