cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c
| From: | Ilia Alshanetsky | Date: | Tue, 14 Dec 2004 17:22:10 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29538@lists.php.net to get a copy of this message | ||
iliaa Tue Dec 14 12:22:10 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mssql php_mssql.c
Log:
Fixed build.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.40&r2=1.86.2.41&ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.40 php-src/ext/mssql/php_mssql.c:1.86.2.41
--- php-src/ext/mssql/php_mssql.c:1.86.2.40 Wed Dec 8 14:02:29 2004
+++ php-src/ext/mssql/php_mssql.c Tue Dec 14 12:22:10 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.86.2.40 2004/12/08 19:02:29 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.41 2004/12/14 17:22:10 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2254,7 +2254,7 @@
break;
}
- dbconvert(NULL, SQLBINARY, (BYTE*)Z_STRVAL_PP(binary), min(16, Z_STRLEN_PP(binary)), SQLCHAR,
buffer, -1);
+ dbconvert(NULL, SQLBINARY, (BYTE*)Z_STRVAL_PP(binary), MIN(16, Z_STRLEN_PP(binary)), SQLCHAR,
buffer, -1);
if (sf) {
php_strtoupper(buffer, 32);