Changeset 381 for trunk/mem.c

Show
Ignore:
Timestamp:
05/10/2007 01:26:12 AM (20 months ago)
Author:
moo
Message:

merged [380] from 1.2: make life easier for debugging

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svnmerge-integrated changed from /branches/1.2:1-324,328,334,339,354,358 to /branches/1.2:1-324,328,334,339,354,358,380

  • trunk/mem.c

    r306 r381  
    99#include <stdlib.h> 
    1010#include <string.h> 
    11 #define XC_SHM_IMPL 
    12 #define XC_MEM_IMPL 
     11#define XC_MEMBLOCK_IMPL _xc_mem_block_t 
     12#define XC_MEM_IMPL _xc_mem_mem_t 
    1313#include "xc_shm.h" 
    1414#include "align.h" 
    … …  
    3131 
    3232/* {{{ mem */ 
    33 struct _xc_block_t { 
     33struct _xc_mem_block_t { 
    3434#ifdef ALLOC_DEBUG_BLOCK_CHECK 
    3535    unsigned int magic; 
    … …  
    3939}; 
    4040 
    41 struct _xc_mem_t { 
     41struct _xc_mem_mem_t { 
    4242    const xc_mem_handlers_t *handlers; 
    4343    xc_shm_t                *shm;