cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h

pollita Thu Jun 3 21:02:22 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mssql php_mssql.c php_mssql.h Log: BugFix# 28626 You can't #ifdef check a typedef. Just give it another name since it's only used once anyway. http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.32&r2=1.86.2.33&ty=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.86.2.32 php-src/ext/mssql/php_mssql.c:1.86.2.33 --- php-src/ext/mssql/php_mssql.c:1.86.2.32 Tue Apr 20 19:31:39 2004 +++ php-src/ext/mssql/php_mssql.c Thu Jun 3 21:02:21 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.86.2.32 2004/04/20 23:31:39 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.86.2.33 2004/06/04 01:02:21 pollita Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -336,7 +336,7 @@ 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; } http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.h?r1=1.23.4.10&r2=1.23.4.11&ty=u Index: php-src/ext/mssql/php_mssql.h diff -u php-src/ext/mssql/php_mssql.h:1.23.4.10 php-src/ext/mssql/php_mssql.h:1.23.4.11 --- php-src/ext/mssql/php_mssql.h:1.23.4.10 Tue Apr 20 19:37:26 2004 +++ php-src/ext/mssql/php_mssql.h Thu Jun 3 21:02:21 2004 @@ -17,7 +17,7 @@ */ -/* $Id: php_mssql.h,v 1.23.4.10 2004/04/20 23:37:26 fmk Exp $ */ +/* $Id: php_mssql.h,v 1.23.4.11 2004/06/04 01:02:21 pollita Exp $ */ #ifndef PHP_MSSQL_H #define 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