Ticket #150: php5.2.diff

eaccelerator.h

@@ -45 +45 @@
-#   define ZEND_ENGINE_2_1
-#endif
-
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2
+#   define ZEND_ENGINE_2_2
+#endif
+
+
+
-/* fixes compile errors on php5.1 */
-#ifdef STR_EMPTY_ALLOC
-#define empty_string STR_EMPTY_ALLOC()
@@ -358 +364 @@
-        eaccelerator_none                       /* don't cache  */
-} eaccelerator_cache_place;
-
+#ifndef align_union
-typedef union align_union {
-  double d;
-  void *v;
-  int (*func)(int);
-  long l;
-} align_union;
+#endif
-
+typedef union _align_test {
+  void *ptr;
+  double dbl;
+  long lng;
+} align_test;
+
-/******************************************************************************/
-
-#ifdef ZTS

ea_store.c

@@ -778 +778 @@
-        /* Check if this is a parent class. If so, copy unconditionally */
-        if (parent) {
-                /* unpack the \0classname\0membername\0 style property name to seperate vars */
+#ifdef ZEND_ENGINE_2_2
+                zend_unmangle_property_name(p->arKey, p->nKeyLength, &cname, &mname);
+#else
-                zend_unmangle_property_name(p->arKey, &cname, &mname);
+#endif
-        
-                /* lookup the member's info in parent and child */
-                if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) &&