diff options
| -rw-r--r-- | ext/odbc/php_odbc.c | 10 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index bb0a0184bd..05f7cf003d 100644 --- 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 1809fe52b3..f67e9a12e7 100644 --- 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) |