cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c
| From: | Marcus Boerger | Date: | Tue, 20 Mar 2007 20:00:27 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43602@lists.php.net to get a copy of this message | ||
helly Tue Mar 20 20:00:27 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli.c
Log:
- MFH Optional dependency for SPL must be specified in header
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.14&r2=1.72.2.16.2.15&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.14 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.15
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.14 Sat Feb 24 02:17:25 2007
+++ php-src/ext/mysqli/mysqli.c Tue Mar 20 20:00:27 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.14 2007/02/24 02:17:25 helly Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.15 2007/03/20 20:00:27 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -415,8 +415,21 @@
/* {{{ 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 = {
+#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),