diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/mssql/php_mssql.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/mssql/php_mssql.h')
| -rw-r--r-- | ext/mssql/php_mssql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index b0313a160a..f0f793ed03 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -167,7 +167,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mssql) long cfg_min_error_severity, cfg_min_message_severity; long connect_timeout, timeout; zend_bool compatibility_mode; - void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval *result,int column_type TSRMLS_DC); + void (*get_column_content)(mssql_link *mssql_ptr,int offset,zval *result,int column_type ); long textsize, textlimit, batchsize; zend_bool datetimeconvert; HashTable *resource_list, *resource_plist; |