Browse Source

merged [480] from trunk: compile against PHP_5_3

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.2@481 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.2
Xuefer 14 years ago
parent
commit
878086303d
  1. 3
      processor/head.m4
  2. 6
      processor/processor.m4
  3. 3
      xcache.h

3
processor/head.m4

@ -255,6 +255,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

6
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

3
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 */

Loading…
Cancel
Save