- 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.

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 27b05f24e47b72cff31f28ec0b0094e5622cf331..7855cae9564a1828275335fd4b800e5c7e385079 100755 (executable)
--- 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 ff3321376dfec5e19e2e0fe5585699bb61d678af..ccf22d04382960fcddeb823c474875059c4b9549 100755 (executable)
--- 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 d48bafc5c94043a3f43d851e1a4bdfc09d90652c..ad2d3fa1900bc061e495012ea93118a572d8c0c1 100644 (file)
--- 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 d641f2d2f6086420289626bf537313331cd2cdcd..5b109c0bd1add1f028193c60af926386ac4a8565 100644 (file)
--- 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),