diff options
| author | Anatol Belski <ab@php.net> | 2016-03-10 08:24:33 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-10 08:45:29 +0100 |
| commit | 3edd33083c59fcbded55a272abee18ae2946d9ce (patch) | |
| tree | 2909cc36b23fa0c40a8dfbee925a8d7d639320d0 /ext/pdo_odbc | |
| parent | 753bbad5353c7bfc13e0fd7b65f0824b6a41e5a8 (diff) | |
| download | php-git-3edd33083c59fcbded55a272abee18ae2946d9ce.tar.gz | |
fix invalid pointer on 64-bit
Diffstat (limited to 'ext/pdo_odbc')
| -rw-r--r-- | ext/pdo_odbc/odbc_driver.c | 2 | ||||
| -rw-r--r-- | ext/pdo_odbc/pdo_odbc.c | 4 | ||||
| -rw-r--r-- | ext/pdo_odbc/php_pdo_odbc_int.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index eca9544f9f..3a9300c5cd 100644 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -393,7 +393,7 @@ static int pdo_odbc_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{{ pdo_odbc_db_handle *H; RETCODE rc; int use_direct = 0; - SQLUINTEGER cursor_lib; + zend_ulong cursor_lib; H = pecalloc(1, sizeof(*H), dbh->is_persistent); diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 04326a4a87..2cc42934c3 100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -66,8 +66,8 @@ ZEND_GET_MODULE(pdo_odbc) #endif #ifdef SQL_ATTR_CONNECTION_POOLING -SQLUINTEGER pdo_odbc_pool_on = SQL_CP_OFF; -SQLUINTEGER pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV; +zend_ulong pdo_odbc_pool_on = SQL_CP_OFF; +zend_ulong pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV; #endif #if defined(DB2CLI_VER) && !defined(PHP_WIN32) diff --git a/ext/pdo_odbc/php_pdo_odbc_int.h b/ext/pdo_odbc/php_pdo_odbc_int.h index ce7c786b5f..5306c96822 100644 --- a/ext/pdo_odbc/php_pdo_odbc_int.h +++ b/ext/pdo_odbc/php_pdo_odbc_int.h @@ -176,8 +176,8 @@ void pdo_odbc_init_error_table(void); void pdo_odbc_fini_error_table(void); #ifdef SQL_ATTR_CONNECTION_POOLING -extern SQLUINTEGER pdo_odbc_pool_on; -extern SQLUINTEGER pdo_odbc_pool_mode; +extern zend_ulong pdo_odbc_pool_on; +extern zend_ulong pdo_odbc_pool_mode; #endif enum { |