cvs: php4(php_4_0_4) /ext/odbc php_odbc.c php_odbc.h

kalowsky Wed Jan 3 07:04:51 2001 EDT Modified files: (Branch: php_4_0_4) /php4/ext/odbc php_odbc.c php_odbc.h Log: These changes are to reflect those in the 4.0.5 development branch. Mainly adding in compile capability for the OPENLINK system (changed a SQLINTEGER to an SDWORD to allow compile), and re-added in a #define for SOLID 3.0 systems... both are needed for proper functionality. PR: Submitted by: Reviewed by: Obtained from: Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.65 php4/ext/odbc/php_odbc.c:1.65.2.1 --- php4/ext/odbc/php_odbc.c:1.65 Fri Nov 17 07:48:09 2000 +++ php4/ext/odbc/php_odbc.c Wed Jan 3 07:04:50 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.65 2000/11/17 15:48:09 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.65.2.1 2001/01/03 15:04:50 kalowsky Exp $ */ #include "php.h" #include "php_globals.h" @@ -610,7 +610,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type) { odbc_result *result; -#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) +#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_OPENLINK) /* this seems to be necessary for Solid2.3 ( tested by * tammy@synchronis.com) and Solid 3.0 (tested by eric@terra.telemediair.nl) * Solid does not seem to declare a SQLINTEGER, but it does declare a Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.30 php4/ext/odbc/php_odbc.h:1.30.2.1 --- php4/ext/odbc/php_odbc.h:1.30 Fri Nov 17 07:09:46 2000 +++ php4/ext/odbc/php_odbc.h Wed Jan 3 07:04:50 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.30 2000/11/17 15:09:46 kalowsky Exp $ */ +/* $Id: php_odbc.h,v 1.30.2.1 2001/01/03 15:04:50 kalowsky Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -34,7 +34,7 @@ /* checking in the same order as in configure.in */ -#if defined(HAVE_SOLID) || defined(HAVE_SOLID_35) /* Solid Server */ +#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) /* Solid Server */ #define ODBC_TYPE "Solid" #if defined(HAVE_SOLID)