[nginx] Core: ngx_module_t compatibility with C++.

Maxim Dounin mdounin at mdounin.ru
Wed Feb 10 03:26:40 UTC 2016


details:   http://hg.nginx.org/nginx/rev/ff1e625ae55b
branches:  
changeset: 6390:ff1e625ae55b
user:      Piotr Sikora <piotrsikora at google.com>
date:      Tue Feb 09 16:31:26 2016 -0800
description:
Core: ngx_module_t compatibility with C++.

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 <piotrsikora at google.com>

diffstat:

 src/core/ngx_module.h |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/src/core/ngx_module.h b/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;



More information about the nginx-devel mailing list