diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /ext/pdo_dblib/php_pdo_dblib_int.h | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
Diffstat (limited to 'ext/pdo_dblib/php_pdo_dblib_int.h')
| -rw-r--r-- | ext/pdo_dblib/php_pdo_dblib_int.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/pdo_dblib/php_pdo_dblib_int.h b/ext/pdo_dblib/php_pdo_dblib_int.h index 5068c83761..01586881d5 100644 --- a/ext/pdo_dblib/php_pdo_dblib_int.h +++ b/ext/pdo_dblib/php_pdo_dblib_int.h @@ -118,6 +118,7 @@ typedef struct { typedef struct { pdo_dblib_db_handle *H; pdo_dblib_err err; + unsigned int computed_column_name_count; } pdo_dblib_stmt; typedef struct { @@ -137,7 +138,12 @@ ZEND_END_MODULE_GLOBALS(dblib) # define DBLIB_G(v) (dblib_globals.v) #endif -ZEND_EXTERN_MODULE_GLOBALS(dblib); +ZEND_EXTERN_MODULE_GLOBALS(dblib) + +enum { + PDO_DBLIB_ATTR_CONNECTION_TIMEOUT = PDO_ATTR_DRIVER_SPECIFIC, + PDO_DBLIB_ATTR_QUERY_TIMEOUT +}; #endif |