felipe Mon, 27 Jun 2011 01:36:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312506
Log:
- Fixed data type usage in 64bit
Reported by: Leonildo Costa
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_driver.c
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/php_pdo_odbc_int.h
U php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_driver.c
U php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c
U php/php-src/branches/PHP_5_4/ext/pdo_odbc/php_pdo_odbc_int.h
U php/php-src/trunk/ext/pdo_odbc/odbc_driver.c
U php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c
U php/php-src/trunk/ext/pdo_odbc/php_pdo_odbc_int.h
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_driver.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_driver.c 2011-06-26
21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_driver.c 2011-06-27
01:36:39 UTC (rev 312506)
@@ -224,7 +224,7 @@
{
pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
RETCODE rc;
- long row_count = -1;
+ SQLLEN row_count = -1;
PDO_ODBC_HSTMT stmt;
rc = SQLAllocHandle(SQL_HANDLE_STMT, H->dbc, &stmt);
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c 2011-06-26
21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/odbc_stmt.c 2011-06-27
01:36:39 UTC (rev 312506)
@@ -164,7 +164,7 @@
RETCODE rc;
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
char *buf = NULL;
- long row_count = -1;
+ SQLLEN row_count = -1;
if (stmt->executed) {
SQLCloseCursor(S->stmt);
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/php_pdo_odbc_int.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/php_pdo_odbc_int.h
2011-06-26 21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/php_pdo_odbc_int.h
2011-06-27 01:36:39 UTC (rev 312506)
@@ -136,7 +136,7 @@
typedef struct {
char *data;
unsigned long datalen;
- long fetched_len;
+ SQLLEN fetched_len;
SWORD coltype;
char colname[128];
unsigned is_long;
Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_driver.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_driver.c 2011-06-26
21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_driver.c 2011-06-27
01:36:39 UTC (rev 312506)
@@ -224,7 +224,7 @@
{
pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
RETCODE rc;
- long row_count = -1;
+ SQLLEN row_count = -1;
PDO_ODBC_HSTMT stmt;
rc = SQLAllocHandle(SQL_HANDLE_STMT, H->dbc, &stmt);
Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c 2011-06-26
21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/odbc_stmt.c 2011-06-27
01:36:39 UTC (rev 312506)
@@ -164,7 +164,7 @@
RETCODE rc;
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
char *buf = NULL;
- long row_count = -1;
+ SQLLEN row_count = -1;
if (stmt->executed) {
SQLCloseCursor(S->stmt);
Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/php_pdo_odbc_int.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/php_pdo_odbc_int.h
2011-06-26 21:34:39 UTC (rev 312505)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/php_pdo_odbc_int.h
2011-06-27 01:36:39 UTC (rev 312506)
@@ -136,7 +136,7 @@
typedef struct {
char *data;
unsigned long datalen;
- long fetched_len;
+ SQLLEN fetched_len;
SWORD coltype;
char colname[128];
unsigned is_long;
Modified: php/php-src/trunk/ext/pdo_odbc/odbc_driver.c
===================================================================
--- php/php-src/trunk/ext/pdo_odbc/odbc_driver.c 2011-06-26 21:34:39 UTC
(rev 312505)
+++ php/php-src/trunk/ext/pdo_odbc/odbc_driver.c 2011-06-27 01:36:39 UTC
(rev 312506)
@@ -224,7 +224,7 @@
{
pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
RETCODE rc;
- long row_count = -1;
+ SQLLEN row_count = -1;
PDO_ODBC_HSTMT stmt;
rc = SQLAllocHandle(SQL_HANDLE_STMT, H->dbc, &stmt);
Modified: php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c
===================================================================
--- php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c 2011-06-26 21:34:39 UTC (rev
312505)
+++ php/php-src/trunk/ext/pdo_odbc/odbc_stmt.c 2011-06-27 01:36:39 UTC (rev
312506)
@@ -164,7 +164,7 @@
RETCODE rc;
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
char *buf = NULL;
- long row_count = -1;
+ SQLLEN row_count = -1;
if (stmt->executed) {
SQLCloseCursor(S->stmt);
Modified: php/php-src/trunk/ext/pdo_odbc/php_pdo_odbc_int.h
===================================================================
--- php/php-src/trunk/ext/pdo_odbc/php_pdo_odbc_int.h 2011-06-26 21:34:39 UTC
(rev 312505)
+++ php/php-src/trunk/ext/pdo_odbc/php_pdo_odbc_int.h 2011-06-27 01:36:39 UTC
(rev 312506)
@@ -136,7 +136,7 @@
typedef struct {
char *data;
unsigned long datalen;
- long fetched_len;
+ SQLLEN fetched_len;
SWORD coltype;
char colname[128];
unsigned is_long;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
