diff options
| author | Sara Golemon <pollita@php.net> | 2004-06-04 01:03:38 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2004-06-04 01:03:38 +0000 |
| commit | ceb73ca0198b4bd22fad363e60db85d249cb0d8e (patch) | |
| tree | 9ad1cec060516904b2411e6fe5b22a8b77475b3c | |
| parent | 89ee6b45ad3749d28289efd552e0770f3e329a6f (diff) | |
| download | php-git-ceb73ca0198b4bd22fad363e60db85d249cb0d8e.tar.gz | |
MFB BugFix# 28626 You can't #ifdef check a typedef. Just give it another name since it's only used once anyway.
| -rw-r--r-- | ext/mssql/php_mssql.c | 2 | ||||
| -rw-r--r-- | 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 c4708802b5..7e501934e3 100644 --- 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 49997b181f..f8a9d6a97f 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 |