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

diff --git a/NEWS b/NEWS
index ab9cde78174b5a43398833faf8b31b7e631f090f..28cb454d78f8c158a5fbc25ec0e7b4c4e74ad8a6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 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>