cvs: php4 /ext/odbc php_odbc.c

andi Wed Apr 18 21:16:28 2001 EDT Modified files: /php4/ext/odbc php_odbc.c Log: - \r\n -> \n Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.79 php4/ext/odbc/php_odbc.c:1.80 --- php4/ext/odbc/php_odbc.c:1.79 Wed Apr 18 19:31:23 2001 +++ php4/ext/odbc/php_odbc.c Wed Apr 18 21:16:27 2001 @@ -15,12 +15,12 @@ | Authors: Stig Sæther Bakken <ssb@fast.no> | | Andreas Karajannis <Andreas.Karajannis@gmd.de> | | Frank M. Kromann <frank@frontbase.com> Support for DB/2 CLI | - | Kevin N. Shallow <kshallow@tampabay.rr.com> Velocis Support | + | Kevin N. Shallow <kshallow@tampabay.rr.com> Velocis Support | | Daniel R. Kalowsky <kalowsky@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.79 2001/04/19 02:31:23 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.80 2001/04/19 04:16:27 andi Exp $ */ #include "php.h" #include "php_globals.h" @@ -65,7 +65,7 @@ #define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0)) -static unsigned char a3_arg3_and_3_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; +static unsigned char a3_arg3_and_3_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; function_entry odbc_functions[] = { PHP_FE(odbc_error, NULL) @@ -1364,7 +1364,7 @@ break; case 3: if (zend_get_parameters_ex(3, &pv_res, &pv_row, &pv_res_arr) == FAILURE) - WRONG_PARAM_COUNT; + WRONG_PARAM_COUNT; SEPARATE_ZVAL(pv_row); convert_to_long_ex(pv_row); rownum = (*pv_row)->value.lval; @@ -1919,11 +1919,11 @@ return FALSE; } } -/* Possible fix for bug # - * Needs testing on UnixODBC < 2.0.5 though. - * #if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC) - * Uncomment the line above, and comment line below to fully test */ -#ifdef HAVE_EMPRESS +/* Possible fix for bug # + * Needs testing on UnixODBC < 2.0.5 though. + * #if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC) + * Uncomment the line above, and comment line below to fully test */ +#ifdef HAVE_EMPRESS { int direct = 0; char dsnbuf[300];