summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/mssql/php_mssql.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index ab9cde7817..28cb454d78 100644
--- 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 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>