From 0d656f2095b463b61d56e2a5d253750a1dc16337 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Sat, 29 Dec 2007 03:48:54 +0000
Subject: [PATCH] merged r490 from b1.2: added module dependency, thanks to
 Cristian Rodriguez

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@492 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 ChangeLog |  1 +
 xcache.c  | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e52a2c3..b473097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Ini Settings Changes
 
 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
  * new: xcache.stat = On
diff --git a/xcache.c b/xcache.c
index 239216d..fc564eb 100644
--- a/xcache.c
+++ b/xcache.c
@@ -2929,11 +2929,28 @@ static ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xcache)
 	return SUCCESS;
 }
 /* }}} */
+/* {{{ 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),
 	PHP_MSHUTDOWN(xcache),