diff options
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index f30a929653..f92ba0cb49 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -31,6 +31,7 @@ #include "ext/standard/info.h" #include "ext/standard/php_string.h" #include "php_mysqli_structs.h" +#include "mysqli_priv.h" #include "zend_exceptions.h" ZEND_DECLARE_MODULE_GLOBALS(mysqli) @@ -527,46 +528,6 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_ /* }}} */ -/* Dependancies */ -static const 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 -#if defined(MYSQLI_USE_MYSQLND) - ZEND_MOD_REQUIRED("mysqlnd") -#endif - {NULL, NULL, NULL} -}; - -/* {{{ mysqli_module_entry - */ -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), - PHP_MSHUTDOWN(mysqli), - PHP_RINIT(mysqli), - PHP_RSHUTDOWN(mysqli), - PHP_MINFO(mysqli), - "0.1", /* Replace with version number for your extension */ - PHP_MODULE_GLOBALS(mysqli), - PHP_GINIT(mysqli), - NULL, - NULL, - STANDARD_MODULE_PROPERTIES_EX -}; -/* }}} */ - -#ifdef COMPILE_DL_MYSQLI -ZEND_GET_MODULE(mysqli) -#endif - /* {{{ PHP_INI_BEGIN */ PHP_INI_BEGIN() @@ -897,7 +858,6 @@ PHP_RINIT_FUNCTION(mysqli) } /* }}} */ - #ifdef MYSQLI_USE_MYSQLND static void php_mysqli_persistent_helper_for_every(void *p) { @@ -962,6 +922,48 @@ PHP_MINFO_FUNCTION(mysqli) } /* }}} */ + +/* Dependancies */ +static const 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 +#if defined(MYSQLI_USE_MYSQLND) + ZEND_MOD_REQUIRED("mysqlnd") +#endif + {NULL, NULL, NULL} +}; + +/* {{{ mysqli_module_entry + */ +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), + PHP_MSHUTDOWN(mysqli), + PHP_RINIT(mysqli), + PHP_RSHUTDOWN(mysqli), + PHP_MINFO(mysqli), + "0.1", /* Replace with version number for your extension */ + PHP_MODULE_GLOBALS(mysqli), + PHP_GINIT(mysqli), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +}; +/* }}} */ + +#ifdef COMPILE_DL_MYSQLI +ZEND_GET_MODULE(mysqli) +#endif + + /* {{{ mixed mysqli_stmt_construct() constructor for statement object. Parameters: |