diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-09-29 15:28:24 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-09-29 15:28:24 +0300 |
| commit | c40de746829971f2edbf9faeae64d4516cb5466e (patch) | |
| tree | ece4a42e478e892423a571fd94a19c0ae1f5ff63 /src/core | |
| parent | 833d03a0a2f9fa62de0f347a08c36a787bcdd8e2 (diff) | |
| download | nginx-c40de746829971f2edbf9faeae64d4516cb5466e.tar.gz nginx-c40de746829971f2edbf9faeae64d4516cb5466e.zip | |
Introduced the NGX_COMPAT macro.
When enabled, some structures are padded to be size compatible
with their NGINX Plus versions.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_config.h | 13 | ||||
| -rw-r--r-- | src/core/ngx_module.h | 8 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index a0bfa63cd..1861be601 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -129,4 +129,17 @@ typedef intptr_t ngx_flag_t; #define NGX_MAX_INT32_VALUE (uint32_t) 0x7fffffff +#if (NGX_COMPAT) + +#define NGX_COMPAT_BEGIN(slots) uint64_t spare[slots]; +#define NGX_COMPAT_END + +#else + +#define NGX_COMPAT_BEGIN(slots) +#define NGX_COMPAT_END + +#endif + + #endif /* _NGX_CONFIG_H_INCLUDED_ */ diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h index a1a0d6c27..c94474693 100644 --- a/src/core/ngx_module.h +++ b/src/core/ngx_module.h @@ -212,6 +212,12 @@ #define NGX_MODULE_SIGNATURE_33 "0" #endif +#if (NGX_COMPAT) +#define NGX_MODULE_SIGNATURE_34 "1" +#else +#define NGX_MODULE_SIGNATURE_34 "0" +#endif + #define NGX_MODULE_SIGNATURE \ NGX_MODULE_SIGNATURE_0 NGX_MODULE_SIGNATURE_1 NGX_MODULE_SIGNATURE_2 \ NGX_MODULE_SIGNATURE_3 NGX_MODULE_SIGNATURE_4 NGX_MODULE_SIGNATURE_5 \ @@ -224,7 +230,7 @@ NGX_MODULE_SIGNATURE_24 NGX_MODULE_SIGNATURE_25 NGX_MODULE_SIGNATURE_26 \ NGX_MODULE_SIGNATURE_27 NGX_MODULE_SIGNATURE_28 NGX_MODULE_SIGNATURE_29 \ NGX_MODULE_SIGNATURE_30 NGX_MODULE_SIGNATURE_31 NGX_MODULE_SIGNATURE_32 \ - NGX_MODULE_SIGNATURE_33 + NGX_MODULE_SIGNATURE_33 NGX_MODULE_SIGNATURE_34 #define NGX_MODULE_V1 \ |