fixed compilation with nginx 1.7.11

Jamesits · Mar 23, 2015 · f62a083 · f62a083
1 parent 7a35372
commit f62a083
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;