Changeset 847

Timestamp:

03/26/2012 12:46:53 PM (14 months ago)

Author:

moo

Message:

fix build for <=PHP_5_2, optimize dirname call

Location:

trunk

Files:

• optimizer.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/optimizer.c

@@ -105 +105 @@
                 case ZEND_SWITCH_FREE:
                 case ZEND_FREE:
-                    if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
+#ifdef EXT_TYPE_FREE_ON_RETURN
+                    if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN))
+#endif
+                    {
                         can_convert = 0;
                     }

trunk/utils.c

@@ -970 +970 @@
 
 #ifndef ZEND_ENGINE_2_3
-size_t zend_dirname(char *path, size_t len) /* {{{ */
-{
+#include "ext/standard/php_string.h"
+size_t xc_dirname(char *path, size_t len) /* {{{ */
+{
+#ifdef ZEND_ENGINE_2
+    return php_dirname(path, len);
+#else
     php_dirname(path, len);
     return strlen(path);
-}
-/* }}} */
-
-long zend_atol(const char *str, int str_len) /* {{{ */
+#endif
+}
+/* }}} */
+
+long xc_atol(const char *str, int str_len) /* {{{ */
 {
     long retval;

trunk/utils.h

@@ -135 +135 @@
 
 #ifndef ZEND_ENGINE_2_3
-size_t zend_dirname(char *path, size_t len);
-long zend_atol(const char *str, int len);
+size_t xc_dirname(char *path, size_t len);
+#define zend_dirname xc_dirname
+long xc_atol(const char *str, int len);
+#define zend_atol xc_atol
 #endif
 

trunk/xcache.c

@@ -3712 +3712 @@
 /* {{{ module dependencies */
 #if ZEND_MODULE_API_NO >= 20050922
-static const zend_module_dep xcache_module_deps[] = {
+static zend_module_dep xcache_module_deps[] = {
     ZEND_MOD_REQUIRED("standard")
     ZEND_MOD_CONFLICTS("apc")