Changeset 1391 in svn for trunk


Ignore:
Timestamp:
2013-09-23T07:23:19Z (2 years ago)
Author:
Xuefer
Message:

fix xtest

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/util/xc_trace.c

    r1174 r1391  
    1 #include "php.h"
     1#ifdef TEST
     2#   define PHP_DIR_SEPARATOR '/'
     3#else
     4#   include "php.h"
     5#endif
    26#include "xc_trace.h"
    37#include <stdio.h>
  • trunk/xcache/xc_allocator.c

    r1378 r1391  
    1 #include "xcache.h"
     1#ifdef TEST
     2#   ifdef HAVE_CONFIG_H
     3#       include <config.h>
     4#   endif
     5#else
     6#   include "xcache.h"
     7#endif
    28#include "xc_allocator.h"
    39#include <string.h>
  • trunk/xcache/xc_allocator_bestfit.c

    r1385 r1391  
    5454} xc_allocator_bestfit_t;
    5555
    56 #ifndef XtOffsetOf
    57 #   include <linux/stddef.h>
    58 #   define XtOffsetOf(s_type, field) offsetof(s_type, field)
    59 #endif
     56#include <stddef.h>
    6057
    6158#define SizeOf(type, field) sizeof( ((type *) 0)->field )
    62 #define BLOCK_HEADER_SIZE() (ALIGN( XtOffsetOf(xc_allocator_bestfit_block_t, size) + SizeOf(xc_allocator_bestfit_block_t, size) ))
     59#define BLOCK_HEADER_SIZE() (ALIGN( offsetof(xc_allocator_bestfit_block_t, size) + SizeOf(xc_allocator_bestfit_block_t, size) ))
    6360
    6461#define BLOCK_MAGIC ((unsigned int) 0x87655678)
  • trunk/xcache/xc_malloc.c

    r1378 r1391  
    222222
    223223static xc_allocator_vtable_t xc_allocator_malloc_vtable = XC_ALLOCATOR_VTABLE(allocator_malloc);
     224#ifndef TEST
    224225static xc_shm_handlers_t xc_shm_malloc_handlers = XC_SHM_HANDLERS(malloc);
     226#endif
    225227void xc_allocator_malloc_register() /* {{{ */
    226228{
Note: See TracChangeset for help on using the changeset viewer.