Changeset 470 for trunk/xc_shm.c

Show
Ignore:
Timestamp:
08/05/2007 02:54:14 AM (16 months ago)
Author:
moo
Message:

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

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,380,423,428,430,432,447,449,453,465,468 to /branches/1.2:1-324,328,334,339,354,358,380,423,428,430,432,447,449,453,465-466,468

  • 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}