Show
Ignore:
Timestamp:
10/17/2006 06:30:41 PM (2 years ago)
Author:
moo
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/1.1

    • Property svnmerge-integrated set to /trunk:1-157,159,161-162,167-180,182,184,186-187,194
  • branches/1.1/xcache-zh-gb2312.ini

    r149 r255  
    1919[xcache] 
    2020; ���Ķ�ѡ���ini ����޸� �������Ĭ�ֵ, ���� 
     21 
     22; select low level shm/allocator scheme implemenation 
     23xcache.shm_scheme =        "mmap" 
    2124; ��xcache.size=0 
    22 ; ��: xcache.size=��>0���, ͬʱ�ע�����ͳ mmap �� 
    23 xcache.size =                  0 
     25; ��: xcache.size=64M ֮� (��>0���) ͬʱ�ע�����ͳ mmap �� 
     26xcache.size  =                0M 
    2427; �����Ϊ cpu � (cat /proc/cpuinfo |grep -c processor) 
    2528xcache.count =                 1 
     
    3134 
    3235; ͬ�, ֻ���Ա������ 
    33 xcache.var_size  =             0 
     36xcache.var_size  =            0M 
    3437xcache.var_count =             1 
    3538xcache.var_slots =            8K 
     
    5659 
    5760xcache.cacher =               On 
     61xcache.stat   =               On 
    5862xcache.optimizer =           Off 
    5963