cvs: php4 /ext/odbc php_odbc.c php_odbc.h

kalowsky Fri Sep 29 12:03:24 2000 EDT Modified files: /php4/ext/odbc php_odbc.c php_odbc.h Log: corrected lines for Solid 2.3 systems after some advice from users, please test... Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.60 php4/ext/odbc/php_odbc.c:1.61 --- php4/ext/odbc/php_odbc.c:1.60 Thu Sep 28 09:42:04 2000 +++ php4/ext/odbc/php_odbc.c Fri Sep 29 12:03:23 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.60 2000/09/28 16:42:04 fmk Exp $ */ +/* $Id: php_odbc.c,v 1.61 2000/09/29 19:03:23 kalowsky Exp $ */ #include "php.h" #include "php_globals.h" @@ -607,7 +607,17 @@ 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) { Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.26 php4/ext/odbc/php_odbc.h:1.27 --- php4/ext/odbc/php_odbc.h:1.26 Tue Aug 22 14:27:49 2000 +++ php4/ext/odbc/php_odbc.h Fri Sep 29 12:03:23 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.26 2000/08/22 21:27:49 kalowsky Exp $ */ +/* $Id: php_odbc.h,v 1.27 2000/09/29 19:03:23 kalowsky Exp $ */ #ifndef PHP_ODBC_H #define 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)