diff options
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 15bb737a8b..44bc7a3444 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -155,7 +155,7 @@ PHP_FUNCTION(solid_fetch_prev); #define ODBC_TYPE "Birdstep" #define UNIX /* - * Extended Fetch in the Birdstep ODBC API is incapable of returning long varchar (memo) fields. + * Extended Fetch in the Birdstep ODBC API is incapable of returning zend_long varchar (memo) fields. * So the following line has been commented-out to accommodate. - KNS * * #define HAVE_SQL_EXTENDED_FETCH 1 @@ -222,7 +222,7 @@ typedef struct odbc_connection { ODBC_SQL_CONN_T hdbc; char laststate[6]; char lasterrormsg[SQL_MAX_MESSAGE_LENGTH]; - int id; + zend_resource *res; int persistent; } odbc_connection; @@ -241,7 +241,7 @@ typedef struct odbc_result { # if HAVE_SQL_EXTENDED_FETCH int fetch_abs; # endif - long longreadlen; + zend_long longreadlen; int binmode; int fetched; odbc_connection *conn_ptr; @@ -251,16 +251,16 @@ ZEND_BEGIN_MODULE_GLOBALS(odbc) char *defDB; char *defUser; char *defPW; - long allow_persistent; - long check_persistent; - long max_persistent; - long max_links; - long num_persistent; - long num_links; + zend_long allow_persistent; + zend_long check_persistent; + zend_long max_persistent; + zend_long max_links; + zend_long num_persistent; + zend_long num_links; int defConn; - long defaultlrl; - long defaultbinmode; - long default_cursortype; + zend_long defaultlrl; + zend_long defaultbinmode; + zend_long default_cursortype; char laststate[6]; char lasterrormsg[SQL_MAX_MESSAGE_LENGTH]; HashTable *resource_list; @@ -273,7 +273,7 @@ void odbc_del_result(HashTable *list, int count); int odbc_add_conn(HashTable *list, HDBC conn); odbc_connection *odbc_get_conn(HashTable *list, int count); void odbc_del_conn(HashTable *list, int ind); -int odbc_bindcols(odbc_result *result TSRMLS_DC); +int odbc_bindcols(odbc_result *result); #define ODBC_SQL_ERROR_PARAMS odbc_connection *conn_resource, ODBC_SQL_STMT_T stmt, char *func |