# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1242662702 0
# Node ID 967ad993a4f8370d96395cbc1d40a8c5ebab8e58
# Parent  dc2c80240b1db32bc2a49a2d806e0fa298d4963a
r2719 merge:

fix building on platforms which have no atomic operations support,
the bug was introduced in r2653 (r2564 in trunk)

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
--- 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_e
 
 
 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
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -198,7 +198,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_lo
 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;