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 751e8fdd27956e8c05e403b9cf0838675b5ecc19..ecbe1edabbf6b2e0a5d0c372f9ba7da35da610ad 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -336,7 +336,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 487ded51b7737e4bf01da0324b250acd4039b9ee..00f4500c900f9e645c3b2ce676962695cd5744f3 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