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

php · Nov 16, 2011 · 8b9d424 · 8b9d424
1 parent 25ccd72
commit 8b9d424
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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>