diff options
| author | Anatol Belski <ab@php.net> | 2014-04-11 13:28:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-11 13:28:13 +0200 |
| commit | f0c95cb70539d24a066dbb22df5a5f5a01d94188 (patch) | |
| tree | 835f0ed0a2382c8ac4290e35c2cad592b235d63c /ext/mysqlnd/mysqlnd_structs.h | |
| parent | 3af4be482ca65e60e397a10ae8fad46ba4e40937 (diff) | |
| parent | 5c87ed058babf40916ac6032e8f6c4f51d291a5e (diff) | |
| download | php-git-f0c95cb70539d24a066dbb22df5a5f5a01d94188.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix syntax error in vc++
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 4d4538da35..66920e47be 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -1024,7 +1024,7 @@ struct st_mysqlnd_result_metadata enum mysqlnd_buffered_type type; \ void * unused1; \ void * unused2; \ - void * unused3; \ + void * unused3 struct st_mysqlnd_buffered_result_parent |