Hello! On Tue, Feb 09, 2016 at 04:32:11PM -0800, Piotr Sikora wrote:
> # HG changeset patch > # User Piotr Sikora <[email protected]> > # Date 1455064286 28800 > # Tue Feb 09 16:31:26 2016 -0800 > # Node ID 4589af8229973093d3287fc3747e1a5245eaaf59 > # Parent 50770821c184a79f3da1707c15e6c835a3596b97 > Core: fix ngx_module_t. > > Changes to NGX_MODULE_V1 and ngx_module_t in 85dea406e18f (1.9.11) > broke all modules written in C++, because ISO C++11 does not allow > conversion from string literal to char *. > > Signed-off-by: Piotr Sikora <[email protected]> > > diff -r 50770821c184 -r 4589af822997 src/core/ngx_module.h > --- a/src/core/ngx_module.h > +++ b/src/core/ngx_module.h > @@ -253,7 +253,7 @@ struct ngx_module_s { > ngx_uint_t spare1; > > ngx_uint_t version; > - char *signature; > + const char *signature; > > void *ctx; > ngx_command_t *commands; Committed with minor changes to commit log, thanks. -- Maxim Dounin http://nginx.org/ _______________________________________________ nginx-devel mailing list [email protected] http://mailman.nginx.org/mailman/listinfo/nginx-devel
