Changeset 348 for eaccelerator/trunk/ea_store.c

Timestamp:

06/20/08 11:20:17 (4 months ago)

Author:

bart

Message:

First stab at php 5.3 support. Only fixes the script cache. phpMyAdmin seems to work with these changes.

Files:

• eaccelerator/trunk/ea_store.c (modified) (3 diffs)

eaccelerator/trunk/ea_store.c

@@ -47 +47 @@
-inline
-#endif
+#ifdef ZEND_ENGINE_2_3
+static size_t calc_string(const char *str, int len TSRMLS_DC)
+#else
-static size_t calc_string(char *str, int len TSRMLS_DC)
+#endif
-{
-    if (len > MAX_DUP_STR_LEN || 
@@ -324 +328 @@
-    EACCELERATOR_ALIGN((*at));
-
+#ifdef ZEND_ENGINE_2_3
+static inline char *store_string(char **at, const char *str, int len TSRMLS_DC)
+#else
-static inline char *store_string(char **at, char *str, int len TSRMLS_DC)
+#endif
-{
-    char *p;
@@ -553 +561 @@
-    to->try_catch_array = from->try_catch_array;
-    to->last_try_catch = from->last_try_catch;
+#ifdef ZEND_ENGINE_2_3
+    to->this_var = from->this_var;
+#else
-    to->uses_this = from->uses_this;
+#endif
-    if (from->try_catch_array != NULL) {
-        to->try_catch_array = (zend_try_catch_element *)ALLOCATE(at, sizeof(zend_try_catch_element) * from->last_try_catch);