diff options
Diffstat (limited to 'src/os/unix/ngx_thread.h')
| -rw-r--r-- | src/os/unix/ngx_thread.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h index e630b356e..5171be6e8 100644 --- a/src/os/unix/ngx_thread.h +++ b/src/os/unix/ngx_thread.h @@ -66,8 +66,8 @@ typedef struct { ngx_int_t ngx_mutex_trylock(ngx_mutex_t *m); -ngx_int_t ngx_mutex_lock(ngx_mutex_t *m); -ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m); +void ngx_mutex_lock(ngx_mutex_t *m); +void ngx_mutex_unlock(ngx_mutex_t *m); #endif @@ -90,10 +90,11 @@ extern ngx_int_t ngx_threads_n; extern volatile ngx_thread_t ngx_threads[NGX_MAX_THREADS]; -ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle); -ngx_err_t ngx_create_thread(ngx_tid_t *tid, void* (*func)(void *arg), void *arg, - ngx_log_t *log); +typedef void * ngx_thread_value_t; +ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle); +ngx_err_t ngx_create_thread(ngx_tid_t *tid, + ngx_thread_value_t (*func)(void *arg), void *arg, ngx_log_t *log); ngx_mutex_t *ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags); void ngx_mutex_destroy(ngx_mutex_t *m); @@ -113,7 +114,7 @@ ngx_int_t ngx_cond_signal(ngx_cond_t *cv); #define NGX_TID_T_FMT "%d" #define ngx_mutex_trylock(m) NGX_OK -#define ngx_mutex_lock(m) NGX_OK +#define ngx_mutex_lock(m) #define ngx_mutex_unlock(m) #define ngx_cond_signal(cv) |