Ignore:
Timestamp:
2009-07-05T07:50:46+02:00 (5 years ago)
Author:
moo
Message:

merged r390,r391 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 390
  • branches/1.3/xc_malloc.c

    r602 r603  
    148148static XC_SHM_IS_READWRITE(xc_malloc_is_readwrite) /* {{{ */ 
    149149{ 
     150#ifdef HAVE_XCACHE_TEST 
    150151    HashPosition pos; 
    151152    size_t *psize; 
     
    160161        zend_hash_move_forward_ex(&shm->blocks, &pos); 
    161162    } 
     163#endif 
    162164 
    163165    return 0; 
Note: See TracChangeset for help on using the changeset viewer.