Changeset 103 in svn for trunk/xcache.h


Ignore:
Timestamp:
2006-08-27T07:09:02+02:00 (9 years ago)
Author:
Xuefer
Message:

PHP_6: builds again with php6. update UChar/void ptr to zstr.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.h

    r95 r103  
    5252                : b->nKeyLength \
    5353                ))
    54 #define BUCKET_KEY(b) (UNISW((b)->arKey, (b)->key.u.string))
    55 #define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.u.unicode))
     54#define BUCKET_KEY(b)  (UNISW((b)->arKey, (b)->key.arKey.s))
     55#define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.arKey.u))
    5656#define BUCKET_KEY_TYPE(b) (UNISW(0, (b)->key.type))
    5757#ifdef IS_UNICODE
     
    6464#ifndef IS_UNICODE
    6565typedef char *zstr;
    66 #   define ZSTR_S(s) (s)
    67 #   define ZSTR_U(s) (s)
    68 #   define ZSTR_V(s) (s)
    69 #else
    70 #   define ZSTR_S(s) ((s)->s)
    71 #   define ZSTR_U(s) ((s)->u)
    72 #   define ZSTR_V(s) ((s)->v)
     66#   define ZSTR_S(s)     (s)
     67#   define ZSTR_U(s)     (s)
     68#   define ZSTR_V(s)     (s)
     69#   define ZSTR_PS(s)    (s)
     70#   define ZSTR_PU(s)    (s)
     71#   define ZSTR_PV(s)    (s)
     72#else
     73#   define ZSTR_S(zs)    ((zs).s)
     74#   define ZSTR_U(zs)    ((zs).u)
     75#   define ZSTR_V(zs)    ((zs).v)
     76#   define ZSTR_PS(pzs)  ((pzs)->s)
     77#   define ZSTR_PU(pzs)  ((pzs)->u)
     78#   define ZSTR_PV(pzs)  ((pzs)->v)
     79#endif
     80
     81#ifndef ZSTR
     82#   define ZSTR(s)      (s)
     83#endif
     84
     85#ifndef Z_UNIVAL
     86#   define Z_UNIVAL(zval) (zval).value.str.val
     87#   define Z_UNILEN(zval) (zval).value.str.len
    7388#endif
    7489
     
    149164    zend_uchar type;
    150165#endif
    151     char *key;
     166    zstr      key;
    152167    zend_uint key_size;
    153168    xc_cest_t cest;
     
    160175    zend_uchar type;
    161176#endif
    162     char *key;
     177    zstr      key;
    163178    zend_uint key_size;
    164179    zend_constant constant;
     
    171186    zend_uchar type;
    172187#endif
    173     char *key;
     188    zstr      key;
    174189    zend_uint key_size;
    175190    zend_function func;
Note: See TracChangeset for help on using the changeset viewer.