fix PHP 5.0 build

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1297 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

mod_cacher/xc_cacher.c

@@ -995,7 +995,6 @@ static int xc_stat(const char *filepath, struct stat *statbuf TSRMLS_DC) /* {{{
 
 		wrapper = php_stream_locate_url_wrapper(filepath, &path_for_open, 0 TSRMLS_CC); 
 		if (wrapper && wrapper->wops->url_stat
-		 && wrapper != &php_plain_files_wrapper
 		 && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS) {
 			*statbuf = ssb.sb;
 			return SUCCESS;

processor/processor.m4

@@ -211,7 +211,7 @@ DEF_STRUCT_P_FUNC(`zend_arg_info', , `dnl {{{
 	PROC_ZSTRING_L(, class_name, class_name_len)
 #ifdef ZEND_ENGINE_2_4
 	PROCESS(zend_uchar, type_hint)
-#else
+#elif defined(ZEND_ENGINE_2_1)
 	PROCESS(zend_bool, array_type_hint)
 #endif
 	PROCESS(zend_bool, allow_null)
@@ -406,15 +406,15 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
 	IFRESTORE(`dst->filename = processor->entry_php_src->filepath;DONE(filename)', `PROC_STRING(filename)')
 	PROCESS(zend_uint, line_start)
 	PROCESS(zend_uint, line_end)
-#		ifdef ZEND_ENGINE_2_1
 	PROCESS(zend_uint, doc_comment_len)
 	PROC_ZSTRING_L(, doc_comment, doc_comment_len)
-#		endif
 #	endif
 
 	/* # NOT DONE */
+#	ifdef ZEND_ENGINE_2_1
 	COPY(serialize_func)
 	COPY(unserialize_func)
+#	endif
 	COPY(iterator_funcs)
 	COPY(create_object)
 	COPY(get_iterator)
@@ -422,8 +422,10 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
 #	ifdef ZEND_ENGINE_2_3
 	COPY(get_static_method)
 #	endif
+#	ifdef ZEND_ENGINE_2_1
 	COPY(serialize)
 	COPY(unserialize)
+#	endif
 	/* deal with it inside xc_fix_method */
 	SETNULL(constructor)
 	COPY(destructor)
@@ -585,7 +587,6 @@ DEF_STRUCT_P_FUNC(`zend_op', , `dnl {{{
 #endif
 	PROCESS(ulong, extended_value)
 	PROCESS(uint, lineno)
-#ifdef ZEND_ENGINE_2_1
 #ifdef ZEND_ENGINE_2_4
 	PROCESS(zend_uchar, op1_type)
 	PROCESS(zend_uchar, op2_type)
@@ -638,7 +639,6 @@ DEF_STRUCT_P_FUNC(`zend_op', , `dnl {{{
 		}
 	')
 	PROCESS(opcode_handler_t, handler)
-#endif
 ')
 dnl }}}
 #ifdef ZEND_ENGINE_2_4