Closed off Solid DB access to a function that it doesn't support in 3.0 and less.

Thanks to Eric Veldhuzen

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index bca98d26b8d8cd553a5ab919c127df8c6d0af15b..a4d24ed27abf46852e25dff3fa81be2a7b0a4095 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -99,7 +99,9 @@ function_entry odbc_functions[] = {
        PHP_FE(odbc_field_type, NULL)
        PHP_FE(odbc_field_num, NULL)
        PHP_FE(odbc_free_result, NULL)
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
        PHP_FE(odbc_next_result, NULL)
+#endif
        PHP_FE(odbc_num_fields, NULL)
        PHP_FE(odbc_num_rows, NULL)
        PHP_FE(odbc_result, NULL)
@@ -2260,6 +2262,7 @@ PHP_FUNCTION(odbc_num_rows)
 }
 /* }}} */
 
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool odbc_next_result(int result_id)
    Checks if multiple results are avaiable */
 PHP_FUNCTION(odbc_next_result)
@@ -2307,6 +2310,7 @@ PHP_FUNCTION(odbc_next_result)
        }
 }
 /* }}} */
+#endif
 
 /* {{{ proto int odbc_num_fields(int result_id)
    Get number of columns in a result */

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 32259086c0d4d219c00ec09baf8b9828a97659c9..9aa48bcfec4b2043065bf2d078c733d621e13d29 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -217,7 +217,9 @@ PHP_FUNCTION(odbc_field_name);
 PHP_FUNCTION(odbc_field_type);
 PHP_FUNCTION(odbc_field_num);
 PHP_FUNCTION(odbc_free_result);
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 PHP_FUNCTION(odbc_next_result);
+#endif
 PHP_FUNCTION(odbc_num_fields);
 PHP_FUNCTION(odbc_num_rows);
 PHP_FUNCTION(odbc_prepare);