diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 4 | ||||
| -rw-r--r-- | src/core/nginx.h | 3 | ||||
| -rw-r--r-- | src/core/ngx_string.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index c2fdc87ba..e1894f4cf 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -90,8 +90,8 @@ int main(int argc, char *const *argv) conf.module_type = NGX_CORE_MODULE; conf.cmd_type = NGX_MAIN_CONF; - conf_file.len = sizeof("nginx.conf") - 1; - conf_file.data = "nginx.conf"; + conf_file.len = sizeof(NGINX_CONF) - 1; + conf_file.data = NGINX_CONF; if (ngx_conf_parse(&conf, &conf_file) != NGX_CONF_OK) { return 1; diff --git a/src/core/nginx.h b/src/core/nginx.h index df00addc1..3bc4bf586 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -2,7 +2,8 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.0.1" +#define NGINX_VER "nginx/0.0.1" +#define NGINX_CONF "nginx.conf" extern int ngx_max_module; diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h index 7c97c1344..9f72f17b0 100644 --- a/src/core/ngx_string.h +++ b/src/core/ngx_string.h @@ -52,9 +52,11 @@ char *ngx_cpystrn(char *dst, char *src, size_t n); int ngx_rstrncmp(char *s1, char *s2, size_t n); int ngx_atoi(char *line, size_t n); +#define ngx_qsort qsort -#define ngx_value_helper(n) #n -#define ngx_value(n) ngx_value_helper(n) + +#define ngx_value_helper(n) #n +#define ngx_value(n) ngx_value_helper(n) #endif /* _NGX_STRING_H_INCLUDED_ */ |
