From 746dd9cbe467868b83c3b969b9467b5e94b7afb4 Mon Sep 17 00:00:00 2001
From: Dan Kalowsky <kalowsky@php.net>
Date: Tue, 19 Jun 2001 17:58:09 +0000
Subject: [PATCH] Closed off Solid DB access to a function that it doesn't
 support in 3.0 and less. Thanks to Eric Veldhuzen

---
 ext/odbc/php_odbc.c | 4 ++++
 ext/odbc/php_odbc.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index bca98d26b8..a4d24ed27a 100644
--- 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 32259086c0..9aa48bcfec 100644
--- 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);
-- 
2.40.0