Changeset 103 for trunk/xcache.h

Timestamp:

2006-08-27T07:09:02+02:00 (7 years ago)

Author:

moo

Message:

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

File:

• trunk/xcache.h (modified) (5 diffs)

trunk/xcache.h

@@ -52 +52 @@
                 : b->nKeyLength \
                 ))
-#define BUCKET_KEY(b) (UNISW((b)->arKey, (b)->key.u.string))
-#define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.u.unicode))
+#define BUCKET_KEY(b)  (UNISW((b)->arKey, (b)->key.arKey.s))
+#define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.arKey.u))
 #define BUCKET_KEY_TYPE(b) (UNISW(0, (b)->key.type))
 #ifdef IS_UNICODE
@@ -64 +64 @@
 #ifndef IS_UNICODE
 typedef char *zstr;
-#   define ZSTR_S(s) (s)
-#   define ZSTR_U(s) (s)
-#   define ZSTR_V(s) (s)
-#else
-#   define ZSTR_S(s) ((s)->s)
-#   define ZSTR_U(s) ((s)->u)
-#   define ZSTR_V(s) ((s)->v)
+#   define ZSTR_S(s)     (s)
+#   define ZSTR_U(s)     (s)
+#   define ZSTR_V(s)     (s)
+#   define ZSTR_PS(s)    (s)
+#   define ZSTR_PU(s)    (s)
+#   define ZSTR_PV(s)    (s)
+#else
+#   define ZSTR_S(zs)    ((zs).s)
+#   define ZSTR_U(zs)    ((zs).u)
+#   define ZSTR_V(zs)    ((zs).v)
+#   define ZSTR_PS(pzs)  ((pzs)->s)
+#   define ZSTR_PU(pzs)  ((pzs)->u)
+#   define ZSTR_PV(pzs)  ((pzs)->v)
+#endif
+
+#ifndef ZSTR
+#   define ZSTR(s)      (s)
+#endif
+
+#ifndef Z_UNIVAL
+#   define Z_UNIVAL(zval) (zval).value.str.val
+#   define Z_UNILEN(zval) (zval).value.str.len
 #endif
 
@@ -149 +164 @@
     zend_uchar type;
 #endif
-    char *key;
+    zstr      key;
     zend_uint key_size;
     xc_cest_t cest;
@@ -160 +175 @@
     zend_uchar type;
 #endif
-    char *key;
+    zstr      key;
     zend_uint key_size;
     zend_constant constant;
@@ -171 +186 @@
     zend_uchar type;
 #endif
-    char *key;
+    zstr      key;
     zend_uint key_size;
     zend_function func;