Changeset 492 for trunk

Timestamp:

12/29/2007 03:48:54 AM (8 months ago)

Author:

moo

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
 ChangeLog
 ========
+ * added module dependency
  * live with wrong system time: allow caching files with mtime in further
  * bug fix for compatibility with Zend Optimizer and other non-cachable

trunk/xcache.c

@@ -2930 +2930 @@
 }
 /* }}} */
+/* {{{ module dependencies */
+#if ZEND_MODULE_API_NO >= 20050922
+static const zend_module_dep xcache_module_deps[] = {
+    ZEND_MOD_REQUIRED("standard")
+    ZEND_MOD_CONFLICTS("apc")
+    ZEND_MOD_CONFLICTS("eAccelerator")
+    ZEND_MOD_CONFLICTS("Turck MMCache")
+    {NULL, NULL, NULL}
+};
+#endif
+/* }}} */ 
 /* {{{ module definition structure */
 
 zend_module_entry xcache_module_entry = {
+#if ZEND_MODULE_API_NO >= 20050922
+    STANDARD_MODULE_HEADER_EX,
+    NULL,
+    xcache_module_deps,
+#else
     STANDARD_MODULE_HEADER,
-    "XCache",
+#endif
+    XCACHE_NAME,
     xcache_functions,
     PHP_MINIT(xcache),