r2719 merge:

fix building on platforms which have no atomic operations support,
the bug was introduced in r2653 (r2564 in trunk)
This commit is contained in:
Igor Sysoev 2009-05-18 16:05:02 +00:00
parent 13433f719a
commit 4764c735ef
2 changed files with 3 additions and 3 deletions

View File

@ -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);
}

View File

@ -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;