Changeset 200 for trunk/processor

Timestamp:

09/29/2006 02:09:51 AM (4 years ago)

Author:

moo

Message:

BUCKET_KEY readability and PHP_6 build fix

Location:

trunk/processor

Files:

• hashtable.m4 (modified) (1 diff)
• head.m4 (modified) (1 diff)
• processor.m4 (modified) (1 diff)

trunk/processor/hashtable.m4

@@ -45 +45 @@
                     buf = erealloc(buf, bufsize);
                 }
-                memcpy(buf, BUCKET_KEY(b), keysize);
+                memcpy(buf, BUCKET_KEY_S(b), keysize);
                 buf[keysize - 2] = buf[keysize - 1] = ""[0];
                 keysize = b->nKeyLength;

trunk/processor/head.m4

@@ -252 +252 @@
     if (src->parent) {
         zval **srczv;
-        if (zend_hash_quick_find(CE_STATIC_MEMBERS(src), b->arKey, b->nKeyLength, b->h, (void **) &srczv) == SUCCESS) {
+        if (zend_u_hash_quick_find(CE_STATIC_MEMBERS(src), BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h, (void **) &srczv) == SUCCESS) {
             zval **zv = (zval **) b->pData;
             if (*srczv == *zv) {

trunk/processor/processor.m4

@@ -57 +57 @@
 DEF_STRUCT_P_FUNC(`zend_brk_cont_element', , `
 #ifdef ZEND_ENGINE_2_2
+#ifndef IS_UNICODE
     DISPATCH(int, start)
+#endif
 #endif
     DISPATCH(int, cont)