diff options
| author | Anatol Belski <ab@php.net> | 2014-08-04 10:28:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-04 10:28:03 +0200 |
| commit | 616275859e2b195e0ea8e90a26a0ed8801a80765 (patch) | |
| tree | 2ff611420601c1edec72c9ea71e3dafd60bc05f6 /ext/odbc/php_odbc_includes.h | |
| parent | 5cadd9d6d08fa195f90746302b4d18ddebb79a12 (diff) | |
| parent | 38a4b934cac843146843e226470c2ed37033a985 (diff) | |
| download | php-git-616275859e2b195e0ea8e90a26a0ed8801a80765.tar.gz | |
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (51 commits)
backport the fix for bug #67739
fix macro
Fix bug #67705 (extensive backtracking in rule regular expression)
add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
...
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 946a3ae59f..2038fa272d 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 |