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/mysqlnd/mysqlnd_plugin.c | |
| 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/mysqlnd/mysqlnd_plugin.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c index f6c78ca0bc..8db06cfd1d 100644 --- a/ext/mysqlnd/mysqlnd_plugin.c +++ b/ext/mysqlnd/mysqlnd_plugin.c @@ -66,7 +66,7 @@ static struct st_mysqlnd_typeii_plugin_example mysqlnd_example_plugin = /* {{{ mysqlnd_example_plugin_end */ -static +static enum_func_status mysqlnd_example_plugin_end(void * p) { struct st_mysqlnd_typeii_plugin_example * plugin = (struct st_mysqlnd_typeii_plugin_example *) p; @@ -91,7 +91,7 @@ mysqlnd_example_plugin_register(void) /*--------------------------------------------------------------------*/ static HashTable mysqlnd_registered_plugins; - + static unsigned int mysqlnd_plugins_counter = 0; |