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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
diff --git a/apa2compat.h b/apa2compat.h
new file mode 100644
index 0000000..0f31e13
--- /dev/null
+++ b/apa2compat.h
@@ -0,0 +1,66 @@
+#ifndef ap_register_cleanup
+# define ap_register_cleanup apr_pool_cleanup_register
+#endif
+#ifndef ap_null_cleanup
+# define ap_null_cleanup apr_pool_cleanup_null
+#endif
+#ifndef ap_table_do
+# define ap_table_do apr_table_do
+#endif
+#ifndef ap_table_get
+# define ap_table_get apr_table_get
+#endif
+#ifndef ap_make_array
+# define ap_make_array apr_array_make
+#endif
+#ifndef ap_palloc
+# define ap_palloc apr_palloc
+#endif
+#ifndef ap_destroy_pool
+# define ap_destroy_pool apr_pool_destroy
+#endif
+#ifndef ap_table_setn
+# define ap_table_setn apr_table_setn
+#endif
+#ifndef ap_pstrcat
+# define ap_pstrcat apr_pstrcat
+#endif
+#ifndef ap_table_unset
+# define ap_table_unset apr_table_unset
+#endif
+#ifndef ap_cpystrn
+# define ap_cpystrn apr_cpystrn
+#endif
+#ifndef ap_pcalloc
+# define ap_pcalloc apr_pcalloc
+#endif
+#ifndef ap_pstrdup
+# define ap_pstrdup apr_pstrdup
+#endif
+#ifndef ap_psprintf
+# define ap_psprintf apr_psprintf
+#endif
+#ifndef ap_table_add
+# define ap_table_add apr_table_add
+#endif
+#ifndef ap_push_array
+# define ap_push_array apr_array_push
+#endif
+#ifndef ap_copy_table
+# define ap_copy_table apr_table_copy
+#endif
+#ifndef ap_pstrndup
+# define ap_pstrndup apr_pstrndup
+#endif
+#ifndef ap_isspace
+# define ap_isspace apr_isspace
+#endif
+#ifndef ap_table_set
+# define ap_table_set apr_table_set
+#endif
+#ifndef ap_make_table
+# define ap_make_table apr_table_make
+#endif
+#ifndef ap_snprintf
+# define ap_snprintf apr_snprintf
+#endif
diff --git a/fcgi_buf.c b/fcgi_buf.c
index 545e67b..37e36ce 100644
--- a/fcgi_buf.c
+++ b/fcgi_buf.c
@@ -9,6 +9,8 @@
#else
#ifdef APACHE2
#include <unistd.h>
+
+#include "apa2compat.h"
#endif
#endif
diff --git a/fcgi_config.c b/fcgi_config.c
index 4591478..f63aba1 100644
--- a/fcgi_config.c
+++ b/fcgi_config.c
@@ -17,6 +17,8 @@
#include "unixd.h"
#endif
+#include "apa2compat.h"
+
#endif
#ifdef WIN32
diff --git a/fcgi_pm.c b/fcgi_pm.c
index f389078..2195cc8 100644
--- a/fcgi_pm.c
+++ b/fcgi_pm.c
@@ -10,6 +10,9 @@
#include <unistd.h>
#include "unixd.h"
#include "apr_signal.h"
+
+#include "apa2compat.h"
+
#endif
#ifndef WIN32
diff --git a/fcgi_protocol.c b/fcgi_protocol.c
index dc688b7..23fa42f 100644
--- a/fcgi_protocol.c
+++ b/fcgi_protocol.c
@@ -7,6 +7,7 @@
#ifdef APACHE2
#include "apr_lib.h"
+#include "apa2compat.h"
#endif
#ifdef WIN32
diff --git a/fcgi_util.c b/fcgi_util.c
index 1edcbe8..68d694d 100644
--- a/fcgi_util.c
+++ b/fcgi_util.c
@@ -17,6 +17,9 @@
#endif
#include "unixd.h"
+
+#include "apa2compat.h"
+
#endif
uid_t
diff --git a/mod_fastcgi.c b/mod_fastcgi.c
index 35b7e88..3a0a872 100644
--- a/mod_fastcgi.c
+++ b/mod_fastcgi.c
@@ -83,6 +83,8 @@
#include "unixd.h"
#endif
+
+#include "apa2compat.h"
#endif
#ifndef timersub
|
