diff options
| author | Sean Finney <seanius@debian.org> | 2009-06-24 22:49:04 +0200 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2009-06-24 22:49:04 +0200 |
| commit | 84f4ca9b07fe5b73d840258f4aa7c1eb534c4253 (patch) | |
| tree | 9829bd578af8a4a8b42b04277f9067e00dc5ad90 /ext/mssql | |
| parent | 6821b67124604da690c5e9276d5370d679c63ac8 (diff) | |
| download | php-84f4ca9b07fe5b73d840258f4aa7c1eb534c4253.tar.gz | |
Imported Upstream version 5.3.0~RC4upstream/5.3.0_RC4upstream/5.3.0.RC4
Diffstat (limited to 'ext/mssql')
| -rw-r--r-- | ext/mssql/php_mssql.c | 4 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index fdaf21493..0f6abf1c5 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.22 2009/02/23 21:21:02 kalle Exp $ */ +/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.23 2009/05/26 12:35:46 felipe Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1834,7 +1834,7 @@ PHP_FUNCTION(mssql_result) ZEND_FETCH_RESOURCE(result, mssql_result *, &mssql_result_index, -1, "MS SQL-result", le_result); if (row < 0 || row >= result->num_rows) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%l)", row); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad row offset (%ld)", row); RETURN_FALSE; } diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index bce672278..6a06bc839 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -17,7 +17,7 @@ */ -/* $Id: php_mssql.h,v 1.42.2.3.2.1.2.3 2008/12/31 11:15:38 sebastian Exp $ */ +/* $Id: php_mssql.h,v 1.42.2.3.2.1.2.4 2009/05/26 12:32:00 felipe Exp $ */ #ifndef PHP_MSSQL_H #define PHP_MSSQL_H @@ -61,7 +61,9 @@ typedef short TDS_SHORT; #define DBMSGHANDLE(a, b) dbmsghandle(b) #define DBSETOPT(a, b, c) dbsetopt(a, b, c, -1) #define NO_MORE_RPC_RESULTS 3 +#ifndef dbfreelogin #define dbfreelogin dbloginfree +#endif #define dbrpcexec dbrpcsend typedef unsigned char *LPBYTE; typedef float DBFLT4; |