Changeset 593 for branches/1.3/mmap.c

Show
Ignore:
Timestamp:
07/05/2009 06:06:15 AM (4 years ago)
Author:
moo
Message:

merged r304,r305,r306,r307 from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/mmap.c

    r394 r593  
    1  
    2 #undef ALLOC_DEBUG 
    31 
    42#include <stdio.h> 
    … …  
    3432#define XC_SHM_IMPL _xc_mmap_shm_t 
    3533#include "xc_shm.h" 
     34#include "utils.h" 
    3635 
    3736#ifndef max 
    … …  
    5554}; 
    5655 
    57 #undef NDEBUG 
    58 #ifdef ALLOC_DEBUG 
    59 #   define inline 
    60 #else 
    61 #   define NDEBUG 
    62 #endif 
    63 #include <assert.h> 
    6456/* }}} */ 
    6557#define CHECK(x, e) do { if ((x) == NULL) { zend_error(E_ERROR, "XCache: " e); goto err; } } while (0)