Changeset 492 for trunk/xcache.c
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svnmerge-integrated changed
/branches/1.2 merged: 490
- Property svnmerge-integrated changed
-
trunk/xcache.c
r488 r492 2930 2930 } 2931 2931 /* }}} */ 2932 /* {{{ module dependencies */ 2933 #if ZEND_MODULE_API_NO >= 20050922 2934 static 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 /* }}} */ 2932 2943 /* {{{ module definition structure */ 2933 2944 2934 2945 zend_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 2935 2951 STANDARD_MODULE_HEADER, 2936 "XCache", 2952 #endif 2953 XCACHE_NAME, 2937 2954 xcache_functions, 2938 2955 PHP_MINIT(xcache),

