pollita Thu Jun 3 21:03:38 2004 EDT
Modified files:
/php-src/ext/mssql php_mssql.c php_mssql.h
Log:
MFB 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.134&r2=1.135&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.134 php-src/ext/mssql/php_mssql.c:1.135
--- php-src/ext/mssql/php_mssql.c:1.134 Tue Apr 20 19:30:51 2004
+++ php-src/ext/mssql/php_mssql.c Thu Jun 3 21:03:38 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.134 2004/04/20 23:30:51 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.135 2004/06/04 01:03:38 pollita Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -340,7 +340,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.36&r2=1.37&ty=u
Index: php-src/ext/mssql/php_mssql.h
diff -u php-src/ext/mssql/php_mssql.h:1.36 php-src/ext/mssql/php_mssql.h:1.37
--- php-src/ext/mssql/php_mssql.h:1.36 Tue Apr 20 19:37:08 2004
+++ php-src/ext/mssql/php_mssql.h Thu Jun 3 21:03:38 2004
@@ -17,7 +17,7 @@
*/
-/* $Id: php_mssql.h,v 1.36 2004/04/20 23:37:08 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.37 2004/06/04 01:03:38 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
