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
index a9221db6e35f12f156a0eaf888f622a33a6dfc25..6eab24ad725b17c54418636ec0a4d65b64d38851 100644 (file)
--- 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 1fd1ad8ad97548c07233362dca23368cf0e3636a..73de6fddc33e7a0d810d9798a6b114bb66399239 100644 (file)
--- 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;