Changeset 603 for branches/1.3

Timestamp:

07/05/2009 07:50:46 AM (4 years ago)

Author:

moo

Message:

merged r390,r391 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xc_malloc.c (modified) (2 diffs)

branches/1.3/xc_malloc.c

@@ -148 +148 @@
 static XC_SHM_IS_READWRITE(xc_malloc_is_readwrite) /* {{{ */
 {
+#ifdef HAVE_XCACHE_TEST
     HashPosition pos;
     size_t *psize;
@@ -160 +161 @@
         zend_hash_move_forward_ex(&shm->blocks, &pos);
     }
+#endif
 
     return 0;