diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/mssql/php_mssql.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/mssql/php_mssql.h')
| -rw-r--r-- | ext/mssql/php_mssql.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h index f0f793ed03..0c85108e5c 100644 --- a/ext/mssql/php_mssql.h +++ b/ext/mssql/php_mssql.h @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -148,7 +148,7 @@ typedef struct mssql_statement { } mssql_statement; typedef struct { - + zval *zval; /* TODO: more data for special types (BLOBS, NUMERIC...) */ } mssql_bind; @@ -179,7 +179,7 @@ ZEND_END_MODULE_GLOBALS(mssql) typedef struct mssql_field { char *name,*column_source; - long max_length; + long max_length; int numeric; int type; } mssql_field; |