cvs: php-src /ext/mysqli mysqli.c
| From: | Marcus Boerger | Date: | Tue, 20 Mar 2007 20:00:07 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43601@lists.php.net to get a copy of this message | ||
helly Tue Mar 20 20:00:07 2007 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
- Optional dependency for SPL must be specified in header
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.103&r2=1.104&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.103 php-src/ext/mysqli/mysqli.c:1.104
--- php-src/ext/mysqli/mysqli.c:1.103 Sat Feb 24 16:25:54 2007
+++ php-src/ext/mysqli/mysqli.c Tue Mar 20 20:00:07 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.103 2007/02/24 16:25:54 helly Exp $
+ $Id: mysqli.c,v 1.104 2007/03/20 20:00:07 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -425,7 +425,20 @@
/* {{{ mysqli_module_entry
*/
+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
STANDARD_MODULE_HEADER,
"mysqli",
mysqli_functions,