Changeset 813 in svn for branches/1.3


Ignore:
Timestamp:
2011-06-04T02:32:32Z (4 years ago)
Author:
Xuefer
Message:

merge from trunk: undefined macro with old php

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 798
  • branches/1.3/xcache.c

    r784 r813  
    22892289    }
    22902290
    2291     RETURN_LONG(Z_REFCOUNT_P(variable));
     2291    RETURN_LONG(Z_REFCOUNT(*variable));
    22922292}
    22932293/* }}} */
     
    23052305    }
    23062306
    2307     RETURN_BOOL(Z_ISREF_P(variable) && Z_REFCOUNT_P(variable) >= 3);
     2307    RETURN_BOOL(Z_ISREF(*variable) && Z_REFCOUNT(*variable) >= 3);
    23082308}
    23092309/* }}} */
  • branches/1.3/xcache.h

    r772 r813  
    5454#   define ALLOCA_FLAG(x)
    5555#endif
     56#ifndef Z_ISREF
     57#   define Z_ISREF(z) (z).is_ref
     58#endif
    5659#ifndef Z_SET_ISREF
    5760#   define Z_SET_ISREF(z) (z).is_ref = 1
     
    5962#ifndef Z_UNSET_ISREF
    6063#   define Z_UNSET_ISREF(z) (z).is_ref = 0
     64#endif
     65#ifndef Z_REFCOUNT
     66#   define Z_REFCOUNT(z) (z).refcount
    6167#endif
    6268#ifndef Z_SET_REFCOUNT
Note: See TracChangeset for help on using the changeset viewer.