Changeset 470 in svn for trunk


Ignore:
Timestamp:
2007-08-05T04:54:14+02:00 (8 years ago)
Author:
Xuefer
Message:

merged r466 from b1.2: support shm-malloc only on --enable-xcache-test

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/config.m4

    r410 r470  
    2828                  mmap.c \
    2929                  mem.c \
    30                   xc_malloc.c \
    3130                  xc_shm.c \
    3231                  const_string.c \
     
    5251  if test "$PHP_XCACHE_TEST" != "no"; then
    5352    XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
     53    xcache_sources="$xcache_sources xc_malloc.c"
    5454    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
    5555  else
  • trunk/config.w32

    r412 r470  
    1616                          mmap.c \
    1717                          mem.c \
    18                           xc_malloc.c \
    1918                          xc_shm.c \
    2019                          const_string.c \
     
    114113    if (PHP_XCACHE_TEST != "no") {
    115114        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
     115        xcache_sources += " xc_malloc.c";
    116116        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
    117117    }
  • trunk/xc_shm.c

    r163 r470  
    2020{
    2121    extern void xc_shm_mem_init();
     22#ifdef HAVE_XCACHE_TEST
    2223    extern void xc_shm_malloc_register();
     24#endif
    2325    extern void xc_shm_mmap_register();
    2426
    2527    memset(xc_shm_schemes, 0, sizeof(xc_shm_schemes));
    2628    xc_shm_mem_init();
     29#ifdef HAVE_XCACHE_TEST
    2730    xc_shm_malloc_register();
     31#endif
    2832    xc_shm_mmap_register();
    2933}
Note: See TracChangeset for help on using the changeset viewer.