Changeset 255 for branches/1.1/mmap.c

Timestamp:

10/17/2006 06:30:41 PM (2 years ago)

Author:

moo

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:

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

branches/1.1/mmap.c

@@ -85 +85 @@
 {
     if (shm->diff) {
-        assert(xc_mmap_is_readonly(p));
+        assert(xc_mmap_is_readonly(shm, p));
         p = PTR_SUB(p, shm->diff);
     }
-    assert(xc_mmap_is_readwrite(p));
+    assert(xc_mmap_is_readwrite(shm, p));
     return p;
 }
@@ -94 +94 @@
 static XC_SHM_TO_READONLY(xc_mmap_to_readonly) /* {{{ */
 {
-    assert(xc_shm_is_readwrite(p));
+    assert(xc_mmap_is_readwrite(shm, p));
     if (shm->diff) {
         p = PTR_ADD(p, shm->diff);
-        assert(xc_mmap_is_readonly(p));
+        assert(xc_mmap_is_readonly(shm, p));
     }
     return p;