blob: 5f54c0ee0d03657ca6fd2f83ffb52acaca0df06e (
plain)
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
|
$NetBSD: patch-aa,v 1.3 2006/12/29 13:35:30 joerg Exp $
--- fcgi.h.orig 2003-02-03 23:07:37.000000000 +0000
+++ fcgi.h
@@ -19,15 +19,15 @@
#endif
/* Apache header files */
-#include "httpd.h"
-#include "http_config.h"
-#include "http_request.h"
-#include "http_core.h"
-#include "http_protocol.h"
-#include "http_main.h"
-#include "http_log.h"
-#include "util_script.h"
-#include "util_md5.h"
+#include <httpd/httpd.h>
+#include <httpd/http_config.h>
+#include <httpd/http_request.h>
+#include <httpd/http_core.h>
+#include <httpd/http_protocol.h>
+#include <httpd/http_main.h>
+#include <httpd/http_log.h>
+#include <httpd/util_script.h>
+#include <httpd/util_md5.h>
/* AP2TODO there's probably a better way */
#ifdef STANDARD20_MODULE_STUFF
@@ -37,8 +37,8 @@
#ifdef APACHE2
#include <sys/stat.h>
-#include "ap_compat.h"
-#include "apr_strings.h"
+#include <httpd/ap_compat.h>
+#include <apr_strings.h>
#ifdef WIN32
#if MODULE_MAGIC_NUMBER < 20020903
@@ -79,7 +79,7 @@ typedef apr_status_t apcb_t;
#else /* !APACHE2 */
-#include "http_conf_globals.h"
+#include <httpd/http_conf_globals.h>
typedef void apcb_t;
#define APCB_OK
@@ -88,6 +88,36 @@ typedef void apcb_t;
#endif
#endif /* !APACHE2 */
+
+/* starting with apache 2.2 the backward-compatibility defines for
+ * 1.3 APIs are not available anymore. Define them ourselves here.
+ */
+#if defined(APACHE2) && !defined(ap_copy_table)
+
+#define ap_copy_table apr_table_copy
+#define ap_cpystrn apr_cpystrn
+#define ap_destroy_pool apr_pool_destroy
+#define ap_isspace apr_isspace
+#define ap_make_array apr_array_make
+#define ap_make_table apr_table_make
+#define ap_null_cleanup apr_pool_cleanup_null
+#define ap_palloc apr_palloc
+#define ap_pcalloc apr_pcalloc
+#define ap_psprintf apr_psprintf
+#define ap_pstrcat apr_pstrcat
+#define ap_pstrdup apr_pstrdup
+#define ap_pstrndup apr_pstrndup
+#define ap_push_array apr_array_push
+#define ap_register_cleanup apr_pool_cleanup_register
+#define ap_snprintf apr_snprintf
+#define ap_table_add apr_table_add
+#define ap_table_do apr_table_do
+#define ap_table_get apr_table_get
+#define ap_table_set apr_table_set
+#define ap_table_setn apr_table_setn
+#define ap_table_unset apr_table_unset
+
+#endif /* defined(ap_copy_table) */
#ifndef NO_WRITEV
#include <sys/uio.h>
@@ -95,7 +125,7 @@ typedef void apcb_t;
#ifdef WIN32
#ifndef APACHE2
-#include "multithread.h"
+#include <multithread.h>
#endif
#pragma warning(default : 4115)
#else
|
