Show
Ignore:
Timestamp:
09/17/2007 10:46:33 AM (15 months ago)
Author:
moo
Message:

scheme=malloc was broken in [465]

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444,456,458 to /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444,456,458,478

  • branches/1.2/config.w32

    r466 r479  
    7171    DEFINE("XCACHE_INDENT", indent); 
    7272    // }}} 
     73    // {{{ check for xcache-test 
     74    ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no"); 
     75    if (PHP_XCACHE_TEST != "no") { 
     76        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST"); 
     77        xcache_sources += " xc_malloc.c"; 
     78        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test"); 
     79    } 
     80    else { 
     81        ADD_FLAG("XCACHE_ENABLE_TEST", ""); 
     82    } 
     83    // }}} 
     84    // {{{ check for xcache-test 
     85    ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no"); 
     86    if (PHP_XCACHE_DPRINT != "no") { 
     87        AC_DEFINE("HAVE_XCACHE_DPRINT", 1, "Define to enable XCache debug print functions"); 
     88    } 
     89    // }}} 
    7390    // {{{ create extension 
    7491    EXTENSION("xcache", xcache_sources); 
    … …  
    109126    ADD_FLAG("CFLAGS_XCACHE", "/I " + builddir); 
    110127    /// }}} 
    111     // {{{ check for xcache-test 
    112     ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no"); 
    113     if (PHP_XCACHE_TEST != "no") { 
    114         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST"); 
    115         xcache_sources += " xc_malloc.c"; 
    116         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test"); 
    117     } 
    118     else { 
    119         ADD_FLAG("XCACHE_ENABLE_TEST", ""); 
    120     } 
    121     // }}} 
    122128    XCACHE_PROC_SOURCES=glob(srcdir + "\\processor\\*.m4").join(' '); 
    123129    ADD_FLAG("XCACHE_PROC_SOURCES", XCACHE_PROC_SOURCES); 
    124     // {{{ check for xcache-test 
    125     ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no"); 
    126     if (PHP_XCACHE_TEST != "no") { 
    127         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache debug print functions"); 
    128     } 
    129     // }}} 
    130130    // {{{ check for opcode_spec_def.h 
    131131    STDOUT.Write("Checking if you have opcode_spec_def.h for XCache ... ");