Changeset 255 in svn for branches/1.1/mmap.c


Ignore:
Timestamp:
2006-10-17T18:30:41Z (9 years ago)
Author:
Xuefer
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/mmap.c

    r148 r255  
    8585{
    8686    if (shm->diff) {
    87         assert(xc_mmap_is_readonly(p));
     87        assert(xc_mmap_is_readonly(shm, p));
    8888        p = PTR_SUB(p, shm->diff);
    8989    }
    90     assert(xc_mmap_is_readwrite(p));
     90    assert(xc_mmap_is_readwrite(shm, p));
    9191    return p;
    9292}
     
    9494static XC_SHM_TO_READONLY(xc_mmap_to_readonly) /* {{{ */
    9595{
    96     assert(xc_shm_is_readwrite(p));
     96    assert(xc_mmap_is_readwrite(shm, p));
    9797    if (shm->diff) {
    9898        p = PTR_ADD(p, shm->diff);
    99         assert(xc_mmap_is_readonly(p));
     99        assert(xc_mmap_is_readonly(shm, p));
    100100    }
    101101    return p;
Note: See TracChangeset for help on using the changeset viewer.