diff options
Diffstat (limited to 'ext/pdo_odbc')
| -rwxr-xr-x | ext/pdo_odbc/config.m4 | 10 | ||||
| -rw-r--r-- | ext/pdo_odbc/odbc_stmt.c | 2 | ||||
| -rw-r--r-- | ext/pdo_odbc/package2.xml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4 index 2301e87b8d..a0b967b09e 100755 --- a/ext/pdo_odbc/config.m4 +++ b/ext/pdo_odbc/config.m4 @@ -6,13 +6,13 @@ define([PDO_ODBC_HELP_TEXT],[[ include and lib dirs are looked for under 'dir'. 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic - If ',dir' part is omitted, default for the flavour + If ',dir' part is omitted, default for the flavour you have selected will be used. e.g.: --with-pdo-odbc=unixODBC - will check for unixODBC under /usr/local. You may attempt - to use an otherwise unsupported driver using the \"generic\" + will check for unixODBC under /usr/local. You may attempt + to use an otherwise unsupported driver using the \"generic\" flavour. The syntax for generic ODBC support is: --with-pdo-odbc=generic,dir,libname,ldflags,cflags @@ -34,7 +34,7 @@ AC_DEFUN([PDO_ODBC_CHECK_HEADER],[ AC_MSG_RESULT(no) fi ]) - + if test "$PHP_PDO_ODBC" != "no"; then if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then @@ -111,7 +111,7 @@ if test "$PHP_PDO_ODBC" != "no"; then PDO_ODBC_INCDIR="$pdo_odbc_def_incdir" PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" fi - + AC_MSG_RESULT([$pdo_odbc_flavour libs $PDO_ODBC_LIBDIR, headers $PDO_ODBC_INCDIR]) diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index ddbecf25b7..e83abf5c13 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -578,7 +578,7 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno) may affect others as well. If we are SQL_VARCHAR, SQL_VARBINARY, or SQL_WVARCHAR (or any of the long variations) and zero is returned from colsize then consider it long */ - if (0 == colsize && + if (0 == colsize && (S->cols[colno].coltype == SQL_VARCHAR || S->cols[colno].coltype == SQL_LONGVARCHAR || #ifdef SQL_WVARCHAR diff --git a/ext/pdo_odbc/package2.xml b/ext/pdo_odbc/package2.xml index 3eb99d1416..1071571155 100644 --- a/ext/pdo_odbc/package2.xml +++ b/ext/pdo_odbc/package2.xml @@ -34,7 +34,7 @@ You require either IBM DB2 CLI libraries or unixODBC to use this package. If you are running on windows, you can download the binary from here: http://pecl4win.php.net/ext.php/php_pdo_odbc.dll - + </notes> <contents> <dir name="/"> |