Changeset 823 for trunk/xcache.h

Timestamp:

2012-03-22T18:29:49+01:00 (14 months ago)

Author:

moo

Message:

PHP_5_4: HashTable? bucket changes

File:

• trunk/xcache.h (modified) (1 diff)

trunk/xcache.h

@@ -140 +140 @@
 #   define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, arKey)
 #endif
-#define BUCKET_SIZE(b) (BUCKET_HEAD_SIZE(b) + BUCKET_KEY_SIZE(b))
+
+#ifdef ZEND_ENGINE_2_4
+#   define BUCKET_SIZE(b) (sizeof(Bucket) + BUCKET_KEY_SIZE(b))
+#else
+#   define BUCKET_SIZE(b) (BUCKET_HEAD_SIZE(b) + BUCKET_KEY_SIZE(b))
+#endif
 
 #ifndef IS_UNICODE