- Fixed bug #60267 (Compile failure with freetds 0.91)

diff --git a/NEWS b/NEWS
index 1b40334ce784d2f32201f1ae77bbc1c796184214..a8dc3a2e9571787b435bc9dbe362a76c6a70ced0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ PHP                                                                        NEWS
 - Gd:
   . Fixed bug #60160 (imagefill() doesn't work correctly
     for small images). (Florian)
+    
+- 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 b5be0259d50368c6266a7adaaf09dd9c7f07f04b..46290c165719a22df3710240fe519e8cc05de8ef 100644 (file)
--- 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>