corrected lines for Solid 2.3 systems after some advice from users, please test...

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index bb0a0184bd421c2716f06bbc1d5fe1284c82c788..05f7cf003dcda78e901c2fcc6b4d2fa851c082c3 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -607,7 +607,17 @@ static int _close_pconn_with_id(list_entry *le, int *id)
 void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
 {
        odbc_result *result;
+#if defined HAVE_SOLID
+       /* this seems to be necessary for Solid2.3 tested by tammy@synchronis.com
+        * Solid 2.3 does not seem to declare a SQLINTEGER, but it does declare
+        * a SQL_INTEGER which does not work (despite being the same type as a
+        * SDWORD.  It is unknown if this is the same behavior for Solid3.0. 
+        * Solid 3.5 does not have this problem.
+        */
+       SDWORD len;
+#else
        SQLINTEGER len;
+#endif
        pval **pv_res, **pv_num;
 
        if (zend_get_parameters_ex(2, &pv_res, &pv_num) == FAILURE) {

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 1809fe52b38a03b95fa796f4b8e1abae1c896484..f67e9a12e7947bfef2e31b3175977e3663bed357 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -41,7 +41,6 @@
  #include <cli0core.h>
  #include <cli0ext1.h>
  /*the following help for SOLID 3.0 */
- #include <cli0cli.h>
  #include <cli0env.h>
 #elif defined(HAVE_SOLID_35)
  #if !defined(PHP_WIN32)