From f62a0838064baf089ad9fe3c8f6f2ffe0775afb2 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Mon, 23 Mar 2015 22:30:37 +0300 Subject: [PATCH] fixed compilation with nginx 1.7.11 --- ngx_rtmp.c | 4 +++- ngx_rtmp.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ngx_rtmp.c b/ngx_rtmp.c index c83e9e1..192b6c9 100644 --- a/ngx_rtmp.c +++ b/ngx_rtmp.c @@ -32,7 +32,9 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf, static ngx_int_t ngx_rtmp_init_process(ngx_cycle_t *cycle); -#if (nginx_version >= 1007005) +#if (nginx_version >= 1007011) +ngx_queue_t ngx_rtmp_init_queue; +#elif (nginx_version >= 1007005) ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; #else ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; diff --git a/ngx_rtmp.h b/ngx_rtmp.h index b87e99e..e6c34d9 100644 --- a/ngx_rtmp.h +++ b/ngx_rtmp.h @@ -607,7 +607,9 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; extern ngx_uint_t ngx_rtmp_naccepted; -#if (nginx_version >= 1007005) +#if (nginx_version >= 1007011) +extern ngx_queue_t ngx_rtmp_init_queue; +#elif (nginx_version >= 1007005) extern ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; #else extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue;