Changeset 481

Timestamp:

2007-10-01T13:35:06+02:00 (6 years ago)

Author:

moo

Message:

merged [480] from trunk: compile against PHP_5_3

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• processor/head.m4 (modified) (1 diff)
• processor/processor.m4 (modified) (2 diffs)
• xcache.h (modified) (1 diff)

branches/1.2/processor/head.m4

@@ -256 +256 @@
 #endif
         SET_IF_SAME_NAME(__call);
+#ifdef ZEND_CALLSTATIC_FUNC_NAME
+        SET_IF_SAME_NAME(__callstatic);
+#endif
 #if defined(ZEND_ENGINE_2_2) || PHP_MAJOR_VERSION >= 6
         SET_IF_SAME_NAME(__tostring);

branches/1.2/processor/processor.m4

@@ -365 +365 @@
     COPY(get_iterator)
     COPY(interface_gets_implemented)
+#ifdef ZEND_ENGINE_2_3
+    COPY(get_static_method)
+#endif
     COPY(serialize)
     COPY(unserialize)
@@ -382 +385 @@
 #endif
     COPY(__call)
+#ifdef ZEND_CALLSTATIC_FUNC_NAME
+    COPY(__callstatic)
+#endif
     /* # NOT DONE */
     COPY(module)

branches/1.2/xcache.h

@@ -25 +25 @@
 #if !defined(ZEND_ENGINE_2_2) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2 || PHP_MAJOR_VERSION > 5)
 #   define ZEND_ENGINE_2_2
+#endif
+#if !defined(ZEND_ENGINE_2_3) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 || PHP_MAJOR_VERSION > 5)
+#   define ZEND_ENGINE_2_3
 #endif