svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mssql/php_mssql.h branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mssql/php_mssql.h
trunk/ext/mssql/php_mssql.h
| From: | Felipe Pena | Date: | Wed, 16 Nov 2011 12:13:22 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mssql/php_mssql.h branches/PHP_5_4/NEWS branches/PHP_5_4/ext/mssql/php_mssql.h trunk/ext/mssql/php_mssql.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67007@lists.php.net to get a copy of this message | ||
felipe Wed, 16 Nov 2011 12:13:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319306
Log:
- Fixed bug #60267 (Compile failure with freetds 0.91)
Bug: https://bugs.php.net/60267 (Open) Compile failure with
freetds 0.91
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.h
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.h
U php/php-src/trunk/ext/mssql/php_mssql.h
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-11-16 11:39:33 UTC (rev 319305)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-11-16 12:13:22 UTC (rev 319306)
@@ -20,6 +20,9 @@
- 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
Modified: php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.h 2011-11-16 11:39:33 UTC (rev 319305)
+++ php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.h 2011-11-16 12:13:22 UTC (rev 319306)
@@ -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>
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-11-16 11:39:33 UTC (rev 319305)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-11-16 12:13:22 UTC (rev 319306)
@@ -9,6 +9,9 @@
(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
Modified: php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.h 2011-11-16 11:39:33 UTC (rev 319305)
+++ php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.h 2011-11-16 12:13:22 UTC (rev 319306)
@@ -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>
Modified: php/php-src/trunk/ext/mssql/php_mssql.h
===================================================================
--- php/php-src/trunk/ext/mssql/php_mssql.h 2011-11-16 11:39:33 UTC (rev 319305)
+++ php/php-src/trunk/ext/mssql/php_mssql.h 2011-11-16 12:13:22 UTC (rev 319306)
@@ -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>