Navigation

Changeset 270

Timestamp:

09/15/06 15:15:06 (2 years ago)

Author:

bart

Message:

Add php 5.2 support. These are minimal changes so they shouldn't affect stability.

Files:

r269	r270
3	3	* Reverse changeset 205 (doc-comment exclusion) from Tom Regner
4	4	<t.regner at librics.de>.
	5	* Some fixes to make eAccelerator compile with php 5.2, this fixes bug #150
	6	* Restore __toString methods correctly with php 5.2
5	7
6	8	2006-08-29 Hans Rakers <hans at parse dot nl>

r269	r270
793	793	memcmp(fname_lc, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) == 0)
794	794	to->__call = f;
	795	# ifdef ZEND_ENGINE_2_2
	796	else if (fname_len == sizeof(ZEND_TOSTRING_FUNC_NAME) - 1 &&
	797	memcmp(fname_lc, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)) == 0)
	798	to->__tostring = f;
	799	# endif
795	800	}
796	801	if (to->parent) {

r269	r270
808	808	if (parent) {
809	809	/* unpack the \0classname\0membername\0 style property name to seperate vars */
	810	#ifdef ZEND_ENGINE_2_2
	811	zend_unmangle_property_name(p->arKey, p->nKeyLength, &cname, &mname);
	812	#else
810	813	zend_unmangle_property_name(p->arKey, &cname, &mname);
	814	#endif
811	815
812	816	/* lookup the member's info in parent and child */

r269	r270
44	44	#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
45	45	# define ZEND_ENGINE_2_1
	46	#endif
	47
	48	#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2
	49	# define ZEND_ENGINE_2_2
46	50	#endif
47	51
…	…
379	383	} align_union;
380	384
	385	#ifdef ZEND_ENGINE_2_2
	386	typedef union _align_test {
	387	void *ptr;
	388	double dbl;
	389	long lng;
	390	} align_test;
	391	#endif
	392
381	393	/******************************************************************************/
382	394