Changeset 1151 in svn for trunk/xcache/xc_compatibility.h


Ignore:
Timestamp:
2012-10-10T14:15:34+02:00 (3 years ago)
Author:
Xuefer
Message:

s/my_/xc_/g

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache/xc_compatibility.h

    r1044 r1151  
    3838
    3939#ifdef do_alloca_with_limit
    40 #   define my_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap)
    41 #   define my_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap)
     40#   define xc_do_alloca(size, use_heap) do_alloca_with_limit(size, use_heap)
     41#   define xc_free_alloca(size, use_heap) free_alloca_with_limit(size, use_heap)
    4242#elif defined(ALLOCA_FLAG)
    43 #   define my_do_alloca(size, use_heap) do_alloca(size, use_heap)
    44 #   define my_free_alloca(size, use_heap) free_alloca(size, use_heap)
    45 #else
    46 #   define my_do_alloca(size, use_heap) do_alloca(size)
    47 #   define my_free_alloca(size, use_heap) free_alloca(size)
     43#   define xc_do_alloca(size, use_heap) do_alloca(size, use_heap)
     44#   define xc_free_alloca(size, use_heap) free_alloca(size, use_heap)
     45#else
     46#   define xc_do_alloca(size, use_heap) do_alloca(size)
     47#   define xc_free_alloca(size, use_heap) free_alloca(size)
    4848#   define ALLOCA_FLAG(x)
    4949#endif
     
    6868/* {{{ dirty fix for PHP 6 */
    6969#ifdef add_assoc_long_ex
    70 static inline void my_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value)
     70static inline void xc_add_assoc_long_ex(zval *arg, char *key, uint key_len, long value)
    7171{
    7272    add_assoc_long_ex(arg, key, key_len, value);
    7373}
    7474#   undef add_assoc_long_ex
    75 #   define add_assoc_long_ex my_add_assoc_long_ex
     75#   define add_assoc_long_ex xc_add_assoc_long_ex
    7676#endif
    7777#ifdef add_assoc_bool_ex
    78 static inline void my_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value)
     78static inline void xc_add_assoc_bool_ex(zval *arg, char *key, uint key_len, zend_bool value)
    7979{
    8080    add_assoc_bool_ex(arg, key, key_len, value);
    8181}
    8282#   undef add_assoc_bool_ex
    83 #   define add_assoc_bool_ex my_add_assoc_bool_ex
     83#   define add_assoc_bool_ex xc_add_assoc_bool_ex
    8484#endif
    8585#ifdef add_assoc_null_ex
    86 static inline void my_add_assoc_null_ex(zval *arg, char *key, uint key_len)
     86static inline void xc_add_assoc_null_ex(zval *arg, char *key, uint key_len)
    8787{
    8888    add_assoc_null_ex(arg, key, key_len);
    8989}
    9090#   undef add_assoc_null_ex
    91 #   define add_assoc_null_ex my_add_assoc_null_ex
     91#   define add_assoc_null_ex xc_add_assoc_null_ex
    9292#endif
    9393/* }}} */
Note: See TracChangeset for help on using the changeset viewer.