diff options
| author | Marcus Boerger <helly@php.net> | 2005-06-23 00:19:16 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-06-23 00:19:16 +0000 |
| commit | 5cf2c9dc454261d55085826ef7865921cd894053 (patch) | |
| tree | 7594a01966b831cbe13780a7a7ca32d6d5578eee | |
| parent | 6553a4c7e23bcc47b71dc10040ebfab4789b96f7 (diff) | |
| download | php-git-5cf2c9dc454261d55085826ef7865921cd894053.tar.gz | |
- Add +ifdefs to still allow PHP 5.0 builds of PDO
# PDO is a PECL extension and at the moment is still meant to compile on
# both PHP 5.0 and PHP 5.1.
| -rwxr-xr-x | ext/pdo/pdo.c | 7 | ||||
| -rwxr-xr-x | ext/pdo_mysql/pdo_mysql.c | 6 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pdo_pgsql.c | 15 | ||||
| -rw-r--r-- | ext/pdo_sqlite/pdo_sqlite.c | 6 |
4 files changed, 33 insertions, 1 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 27b05f24e4..7855cae956 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -87,19 +87,24 @@ function_entry pdo_functions[] = { /* }}} */ /* {{{ pdo_functions[] */ +#if ZEND_EXTENSION_API_NO >= 220050617 static zend_module_dep pdo_deps[] = { #ifdef HAVE_SPL ZEND_MOD_REQUIRED("spl") #endif {NULL, NULL, NULL} }; - +#endif /* }}} */ /* {{{ pdo_module_entry */ zend_module_entry pdo_module_entry = { +#if ZEND_EXTENSION_API_NO >= 220050617 STANDARD_MODULE_HEADER_EX, NULL, pdo_deps, +#else + STANDARD_MODULE_HEADER, +#endif "PDO", pdo_functions, PHP_MINIT(pdo), diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index ff3321376d..ccf22d0438 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -37,16 +37,22 @@ function_entry pdo_mysql_functions[] = { /* }}} */ /* {{{ pdo_mysql_functions[] */ +#if ZEND_EXTENSION_API_NO >= 220050617 static zend_module_dep pdo_mysql_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; +#endif /* }}} */ /* {{{ pdo_mysql_module_entry */ zend_module_entry pdo_mysql_module_entry = { +#if ZEND_EXTENSION_API_NO >= 220050617 STANDARD_MODULE_HEADER_EX, NULL, pdo_mysql_deps, +#else + STANDARD_MODULE_HEADER, +#endif "pdo_mysql", pdo_mysql_functions, PHP_MINIT(pdo_mysql), diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index d48bafc5c9..ad2d3fa190 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -36,9 +36,24 @@ function_entry pdo_pgsql_functions[] = { }; /* }}} */ +/* {{{ pdo_sqlite_deps + */ +#if ZEND_EXTENSION_API_NO >= 220050617 +static zend_module_dep pdo_pgsql_deps[] = { + ZEND_MOD_REQUIRED("pdo") + {NULL, NULL, NULL} +}; +#endif +/* }}} */ + /* {{{ pdo_pgsql_module_entry */ zend_module_entry pdo_pgsql_module_entry = { +#if ZEND_EXTENSION_API_NO >= 220050617 + STANDARD_MODULE_HEADER_EX, NULL, + pdo_pgsql_deps, +#else STANDARD_MODULE_HEADER, +#endif "pdo_pgsql", pdo_pgsql_functions, PHP_MINIT(pdo_pgsql), diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index d641f2d2f6..5b109c0bd1 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -41,17 +41,23 @@ function_entry pdo_sqlite_functions[] = { /* {{{ pdo_sqlite_deps */ +#if ZEND_EXTENSION_API_NO >= 220050617 static zend_module_dep pdo_sqlite_deps[] = { ZEND_MOD_REQUIRED("pdo") {NULL, NULL, NULL} }; +#endif /* }}} */ /* {{{ pdo_sqlite_module_entry */ zend_module_entry pdo_sqlite_module_entry = { +#if ZEND_EXTENSION_API_NO >= 220050617 STANDARD_MODULE_HEADER_EX, NULL, pdo_sqlite_deps, +#else + STANDARD_MODULE_HEADER, +#endif "pdo_sqlite", pdo_sqlite_functions, PHP_MINIT(pdo_sqlite), |