Changeset 593 in svn for branches/1.3/xc_malloc.c


Ignore:
Timestamp:
2009-07-05T04:06:15Z (6 years ago)
Author:
Xuefer
Message:

merged r304,r305,r306,r307 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/xc_malloc.c

    r479 r593  
    1111#include "php.h"
    1212#include "align.h"
     13#include "utils.h"
    1314
    1415struct _xc_malloc_mem_t {
     
    116117    xc_shmsize_t       memoffset;
    117118};
    118 
    119 #undef NDEBUG
    120 #ifdef ALLOC_DEBUG
    121 #   define inline
    122 #else
    123 #   define NDEBUG
    124 #endif
    125 #include <assert.h>
    126119/* }}} */
    127120
Note: See TracChangeset for help on using the changeset viewer.