Changeset 813 for branches/1.3

Timestamp:

2011-06-04T04:32:32+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk: undefined macro with old php

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (2 diffs)
• xcache.h (modified) (2 diffs)

branches/1.3/xcache.c

@@ -2289 +2289 @@
     }
 
-    RETURN_LONG(Z_REFCOUNT_P(variable));
+    RETURN_LONG(Z_REFCOUNT(*variable));
 }
 /* }}} */
@@ -2305 +2305 @@
     }
 
-    RETURN_BOOL(Z_ISREF_P(variable) && Z_REFCOUNT_P(variable) >= 3);
+    RETURN_BOOL(Z_ISREF(*variable) && Z_REFCOUNT(*variable) >= 3);
 }
 /* }}} */

branches/1.3/xcache.h

@@ -54 +54 @@
 #   define ALLOCA_FLAG(x)
 #endif
+#ifndef Z_ISREF
+#   define Z_ISREF(z) (z).is_ref
+#endif
 #ifndef Z_SET_ISREF
 #   define Z_SET_ISREF(z) (z).is_ref = 1
@@ -59 +62 @@
 #ifndef Z_UNSET_ISREF
 #   define Z_UNSET_ISREF(z) (z).is_ref = 0
+#endif
+#ifndef Z_REFCOUNT
+#   define Z_REFCOUNT(z) (z).refcount
 #endif
 #ifndef Z_SET_REFCOUNT