diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-10-23 11:28:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-10-23 11:28:22 +0800 |
| commit | 334deefa2913cb4740e6bb30259dc65f3e07adc2 (patch) | |
| tree | 16e4b0b3cd1d35f4d8e1de67cd729dcbabf5dfca | |
| parent | 40648d7fc8b1dab70704073d2b5d2f235ec0ec02 (diff) | |
| parent | 90d1e9d1780945db21ea8d164e24625ad4fd75e9 (diff) | |
| download | php-git-334deefa2913cb4740e6bb30259dc65f3e07adc2.tar.gz | |
Merge branch 'fix-folding-marker' of https://github.com/ngsw/php-src
| -rw-r--r-- | sapi/fpm/fpm/fpm_events.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c index ca45cb1665..2b8e8cf13a 100644 --- a/sapi/fpm/fpm/fpm_events.c +++ b/sapi/fpm/fpm/fpm_events.c @@ -291,7 +291,7 @@ int fpm_event_pre_init(char *machanism) /* {{{ */ } return -1; } -/* }} */ +/* }}} */ const char *fpm_event_machanism_name() /* {{{ */ { @@ -538,4 +538,3 @@ int fpm_event_del(struct fpm_event_s *ev) /* {{{ */ } /* }}} */ -/* }}} */ |