From 254451337c3ce1ff86acb90f706a1db80baa1daf Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Fri, 4 Jun 2004 01:02:21 +0000 Subject: [PATCH] BugFix# 28626 You can't #ifdef check a typedef. Just give it another name since it's only used once anyway. --- ext/mssql/php_mssql.c | 2 +- ext/mssql/php_mssql.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 751e8fdd27..ecbe1edabb 100644 --- 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 487ded51b7..00f4500c90 100644 --- 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 -- 2.40.0