diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:05:02 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:05:02 +0000 |
commit | 2d7195bdb711390302eec115744aae289a231314 (patch) | |
tree | 0405b7e902d1719141d03a160a192ad560e54f17 | |
parent | 0919207d9fbacacc917d99d024148e22f2668901 (diff) | |
download | nginx-2d7195bdb711390302eec115744aae289a231314.tar.gz |
r2719 merge:
fix building on platforms which have no atomic operations support,
the bug was introduced in r2653 (r2564 in trunk)
-rw-r--r-- | src/core/ngx_log.c | 4 | ||||
-rw-r--r-- | src/core/ngx_log.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c index a9221db6e..6eab24ad7 100644 --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -184,9 +184,9 @@ ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, const char *fmt, ...) void -ngx_log_abort(ngx_err_t err, const char *text) +ngx_log_abort(ngx_err_t err, const char *text, void *param) { - ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, text); + ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, text, param); } diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h index 1fd1ad8ad..73de6fddc 100644 --- a/src/core/ngx_log.h +++ b/src/core/ngx_log.h @@ -198,7 +198,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, ngx_log_t *ngx_log_init(void); ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args); char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log); -void ngx_log_abort(ngx_err_t err, const char *text); +void ngx_log_abort(ngx_err_t err, const char *text, void *param); extern ngx_module_t ngx_errlog_module; |