zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-09 22:11:08 +02:00
Code Issues Projects Releases Wiki Activity

fixed compilation

Browse source
This commit is contained in:
Roman Arutyunyan 2014-09-17 07:10:38 +04:00
parent c390521963
commit dd5f2aa117
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ngx_rtmp.c
View file

@ -31,7 +31,11 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
ngx_uint_t ctx_index);
#if (nginx_version >= 1007005)
ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue;
#else
ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue;
#endif
ngx_uint_t ngx_rtmp_max_module;

9
ngx_rtmp.h
View file

@ -12,6 +12,7 @@
#include <ngx_core.h>
#include <ngx_event.h>
#include <ngx_event_connect.h>
#include <nginx.h>
#include "ngx_rtmp_amf.h"
#include "ngx_rtmp_bandwidth.h"
@ -198,7 +199,11 @@ typedef struct {
ngx_str_t *addr_text;
int connected;
#if (nginx_version >= 1007005)
ngx_queue_t posted_dry_events;
#else
ngx_event_t *posted_dry_events;
#endif
/* client buffer time in msec */
uint32_t buflen;
@ -602,7 +607,11 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in;
extern ngx_uint_t ngx_rtmp_naccepted;
#if (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;
#endif
extern ngx_uint_t ngx_rtmp_max_module;
extern ngx_module_t ngx_rtmp_core_module;

8
ngx_rtmp_play_module.c
View file

@ -6,6 +6,7 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <nginx.h>
#include "ngx_rtmp_play_module.h"
#include "ngx_rtmp_cmd_module.h"
#include "ngx_rtmp_netcall_module.h"
@ -430,7 +431,12 @@ ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s)
ngx_del_timer(&ctx->send_evt);
}
if (ctx->send_evt.prev) {
#if (nginx_version >= 1007005)
if (ctx->send_evt.posted)
#else
if (ctx->send_evt.prev)
#endif
{
ngx_delete_posted_event((&ctx->send_evt));
}