1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From dd5f2aa117c617e1f0fde26f8fd58903be2d85e8 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Wed, 17 Sep 2014 07:10:38 +0400
Subject: [PATCH] fixed compilation
---
ngx_rtmp.c | 4 ++++
ngx_rtmp.h | 9 +++++++++
ngx_rtmp_play_module.c | 8 +++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/ngx_rtmp.c b/ngx_rtmp.c
index c079c90..e525a93 100644
--- a/ngx_rtmp.c
+++ b/ngx_rtmp.c
@@ -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;
diff --git a/ngx_rtmp.h b/ngx_rtmp.h
index d3648f7..b87e99e 100644
--- a/ngx_rtmp.h
+++ b/ngx_rtmp.h
@@ -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;
diff --git a/ngx_rtmp_play_module.c b/ngx_rtmp_play_module.c
index acaa46c..f6ea6c3 100644
--- a/ngx_rtmp_play_module.c
+++ b/ngx_rtmp_play_module.c
@@ -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));
}
|
GitWeb