MFB BugFix# 28626 You can't #ifdef check a typedef. Just give it another name since...

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index c4708802b56a6059efdb84ef399076cbd211f485..7e501934e30abab4c3392f3dbfeb3424e0d8e260 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -340,7 +340,7 @@ PHP_RINIT_FUNCTION(mssql)
        dbsetlogintime(MS_SQL_G(connect_timeout));
        if (MS_SQL_G(timeout) < 0) MS_SQL_G(timeout) = 60;
        dbsettime(MS_SQL_G(timeout));
-       dbsetmaxprocs((SHORT)MS_SQL_G(max_procs));
+       dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
 
        return SUCCESS;
 }

diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 49997b181f14ee76d272f1bc1298f3b426f34e2d..f8a9d6a97f2ef5c6a8fb9c6d658c2ba976715633 100644 (file)
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -37,9 +37,7 @@
 #include "sqldb.h"
 
 #if HAVE_FREETDS
-#ifndef SHORT
-typedef short SHORT;
-#endif
+typedef short TDS_SHORT;
 #define SQLTEXT SYBTEXT
 #define SQLCHAR SYBCHAR
 #define SQLVARCHAR SYBVARCHAR