From 6b0f3f9cdf42a4c4966d3a9ea79c672b99051528 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Mon, 1 Oct 2007 11:24:34 +0000
Subject: [PATCH] compile against PHP_5_3

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@480 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 processor/head.m4      | 3 +++
 processor/processor.m4 | 6 ++++++
 xcache.h               | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/processor/head.m4 b/processor/head.m4
index cca2e9e..56b26e5 100644
--- a/processor/head.m4
+++ b/processor/head.m4
@@ -256,6 +256,9 @@ dnl FIXME: handle common.function_name here
 		SET_IF_SAME_NAME(__isset);
 #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);
 #endif
diff --git a/processor/processor.m4 b/processor/processor.m4
index 5bfd291..149342e 100644
--- a/processor/processor.m4
+++ b/processor/processor.m4
@@ -364,6 +364,9 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
 	COPY(create_object)
 	COPY(get_iterator)
 	COPY(interface_gets_implemented)
+#ifdef ZEND_ENGINE_2_3
+	COPY(get_static_method)
+#endif
 	COPY(serialize)
 	COPY(unserialize)
 	/* deal with it inside xc_fix_method */
@@ -381,6 +384,9 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
 # endif
 #endif
 	COPY(__call)
+#ifdef ZEND_CALLSTATIC_FUNC_NAME
+	COPY(__callstatic)
+#endif
 	/* # NOT DONE */
 	COPY(module)
 #else
diff --git a/xcache.h b/xcache.h
index bee6c51..fa2eb00 100644
--- a/xcache.h
+++ b/xcache.h
@@ -25,6 +25,9 @@
 #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
 
 #define NOTHING
 /* ZendEngine code Switcher */