PHP 6 fix

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@659 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
14 years ago · 0af97244f2
parent 2d2b69a0be
commit 0af97244f2
1 changed files with 3 additions and 2 deletions
--- a/xcache.h
+++ b/xcache.h
@ -103,8 +103,9 @@ static inline void my_add_assoc_null_ex(zval *arg, char *key, uint key_len)
 				? UBYTES(b->nKeyLength) \
 				: b->nKeyLength \
 				))
-#define BUCKET_KEY_S(b)    (UNISW((b)->arKey, (b)->key.arKey.s))
-#define BUCKET_KEY_U(b)    (UNISW((b)->arKey, (b)->key.arKey.u))
+#define BUCKET_KEY(b)      (UNISW((b)->arKey, (b)->key.arKey))
+#define BUCKET_KEY_S(b)    ZSTR_S(BUCKET_KEY(b))
+#define BUCKET_KEY_U(b)    ZSTR_U(BUCKET_KEY(b))
 #define BUCKET_KEY_TYPE(b) (UNISW(IS_STRING,  (b)->key.type))
 #ifdef IS_UNICODE
 #	define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, key.arKey)