diff options
| author | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
| commit | 2fd7d60ea06aa07b99dc219655be7ab42b7e2e16 (patch) | |
| tree | 2835e4d2625870eb707e0361a769e4921aff8609 /ext/odbc/php_odbc.c | |
| parent | a7d2747890846ed68cc86c6e8d3fd005525ff0cc (diff) | |
| parent | e9b23401514a642b58084784305c1d19cf86a823 (diff) | |
| download | php-git-2fd7d60ea06aa07b99dc219655be7ab42b7e2e16.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 02af2d94ca..13bd9e1628 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -2615,13 +2615,13 @@ try_and_get_another_connection: zend_resource *index_ptr, new_index_ptr; if ((index_ptr = zend_hash_str_find_ptr(&EG(regular_list), hashed_details, hashed_len)) != NULL) { - int conn_id; + zend_ulong conn_id; zend_resource *p; if (index_ptr->type != le_index_ptr) { RETURN_FALSE; } - conn_id = (int)index_ptr->ptr; + conn_id = (zend_ulong)index_ptr->ptr; p = zend_hash_index_find_ptr(&EG(regular_list), conn_id); /* check if the connection is still there */ if (p && p->ptr && (p->type == le_conn || p->type == le_pconn)) { |