diff options
| author | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-09-03 11:28:30 -0400 |
| commit | b16929ca7294fb047e63eb6c04d715d980a50c47 (patch) | |
| tree | e8ccc6acd38dbf670380cccc500100279d74f53d /ext/odbc/php_odbc_includes.h | |
| parent | bba16dde5ded45802543712bb3b9fe6e93b10751 (diff) | |
| parent | 9266227402f50e1ad9953952b68a5ff3a25806b0 (diff) | |
| download | php-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index a9b0acfa0c..06113d9624 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -115,6 +115,7 @@ PHP_FUNCTION(solid_fetch_prev); #endif #define ODBC_TYPE "unixODBC" +#undef ODBCVER #include <sql.h> #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 @@ -284,7 +285,11 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC); void odbc_sql_error(ODBC_SQL_ERROR_PARAMS); +#if defined(ODBCVER) && (ODBCVER >= 0x0300) +#define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR || x == SQL_WLONGVARCHAR) +#else #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR) +#endif #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY) #ifdef ZTS |