diff options
| author | Felipe Pena <felipe@php.net> | 2011-11-16 12:13:22 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-11-16 12:13:22 +0000 |
| commit | 8b9d42417fa5fa943a5367c16e9ebc7c2b65a3c7 (patch) | |
| tree | 14166f14d7baf94a4cefc98f32097123275c322d | |
| parent | 25ccd7221774e33b0e37e522dd9c74359d5c8778 (diff) | |
| download | php-git-8b9d42417fa5fa943a5367c16e9ebc7c2b65a3c7.tar.gz | |
- Fixed bug #60267 (Compile failure with freetds 0.91)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.h | 5 |
2 files changed, 8 insertions, 0 deletions
@@ -9,6 +9,9 @@ PHP NEWS (klightspeed at netspace dot net dot au) . Fixed bug #52624 (tempnam() by-pass open_basedir with nonexistent directory). (Felipe) + +- MS SQL: + . Fixed bug #60267 (Compile failure with freetds 0.91). (Felipe) - OpenSSL: . Fixed bug #60279 (Fixed NULL pointer dereference in diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index b5be0259d5..46290c1657 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -26,6 +26,11 @@ #if HAVE_MSSQL #define MSDBLIB +/* FreeTDS checks for PHP_MSSQL_API for avoid type redefinition */ +#ifdef HAVE_FREETDS +#define PHP_MSSQL_API +#endif + #include <sqlfront.h> #include <sqldb.h> |