Changeset 492 in svn for trunk


Ignore:
Timestamp:
2007-12-29T03:48:54Z (8 years ago)
Author:
Xuefer
Message:

merged r490 from b1.2: added module dependency, thanks to Cristian Rodriguez

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/ChangeLog

    r472 r492  
    66ChangeLog
    77========
     8 * added module dependency
    89 * live with wrong system time: allow caching files with mtime in further
    910 * bug fix for compatibility with Zend Optimizer and other non-cachable
  • trunk/xcache.c

    r488 r492  
    29302930}
    29312931/* }}} */
     2932/* {{{ module dependencies */
     2933#if ZEND_MODULE_API_NO >= 20050922
     2934static const zend_module_dep xcache_module_deps[] = {
     2935    ZEND_MOD_REQUIRED("standard")
     2936    ZEND_MOD_CONFLICTS("apc")
     2937    ZEND_MOD_CONFLICTS("eAccelerator")
     2938    ZEND_MOD_CONFLICTS("Turck MMCache")
     2939    {NULL, NULL, NULL}
     2940};
     2941#endif
     2942/* }}} */
    29322943/* {{{ module definition structure */
    29332944
    29342945zend_module_entry xcache_module_entry = {
     2946#if ZEND_MODULE_API_NO >= 20050922
     2947    STANDARD_MODULE_HEADER_EX,
     2948    NULL,
     2949    xcache_module_deps,
     2950#else
    29352951    STANDARD_MODULE_HEADER,
    2936     "XCache",
     2952#endif
     2953    XCACHE_NAME,
    29372954    xcache_functions,
    29382955    PHP_MINIT(xcache),
Note: See TracChangeset for help on using the changeset viewer.