Author: grichter
Date: 2007-03-30 10:21:42 +0200 (Fri, 30 Mar 2007)
New Revision: 314
Modified:
trunk/php5/ext/mysqli/mysqli.c
Log:
optional dependency for SPL must be specified in header
Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c 2007-03-29 19:03:12 UTC (rev 313)
+++ trunk/php5/ext/mysqli/mysqli.c 2007-03-30 08:21:42 UTC (rev 314)
@@ -449,8 +449,22 @@
/* {{{ mysqli_module_entry
*/
+
+/* Dependancies */
+static zend_module_dep mysqli_deps[] = {
+#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5
&& PHP_MINOR_VERSION >= 1))
+ ZEND_MOD_REQUIRED("spl")
+#endif
+ {NULL, NULL, NULL}
+};
+
zend_module_entry mysqli_module_entry = {
- STANDARD_MODULE_HEADER,
+#if ZEND_MODULE_API_NO >= 20050922
+ STANDARD_MODULE_HEADER_EX, NULL,
+ mysqli_deps,
+#elif ZEND_MODULE_API_NO >= 20010901
+ STANDARD_MODULE_HEADER,
+#endif
"mysqli",
mysqli_functions,
PHP_MINIT(mysqli),
| Thread |
|---|
| • PHP mysqlnd svn commit: r314 - trunk/php5/ext/mysqli | grichter | 30 Mar |
