Skip to content

Commit b95c261

Browse files
committed
more module build cleanup, removing warnings and some
link errors (from when apr_ ctype macros weren't available) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88070 13f79535-47bb-0310-9956-ffa450edef68
1 parent e5ef8c2 commit b95c261

6 files changed

Lines changed: 22 additions & 1 deletion

File tree

STATUS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APACHE 2.0 STATUS: -*-text-*-
2-
Last modified at [$Date: 2001/02/10 00:33:36 $]
2+
Last modified at [$Date: 2001/02/10 22:21:22 $]
33

44
Release:
55

@@ -178,6 +178,8 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
178178

179179
* shift stuff to mod_core.h
180180

181+
* APR-ize resolver stuff in mod_unique_id (Jeff volunteers)
182+
181183
PRs that have been suspended forever waiting for someone to
182184
put them into 'the next release':
183185

modules/aaa/mod_auth_db.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
#include "http_log.h"
101101
#include "http_protocol.h"
102102
#include "http_request.h" /* for ap_hook_(check_user_id | auth_check) */
103+
#include "apr_lib.h"
104+
#define APR_WANT_STRFUNC
105+
#include "apr_want.h"
103106
#ifdef HAVE_DB_H
104107
#include <db.h>
105108
#endif

modules/aaa/mod_auth_dbm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
#include "http_protocol.h"
7878
#include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/
7979
#include "apr_lib.h"
80+
#define APR_WANT_STRFUNC
81+
#include "apr_want.h"
8082

8183
#if defined(AP_AUTH_DBM_USE_APR)
8284
#include "apr_dbm.h"

modules/generators/mod_status.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@
109109
#if APR_HAVE_UNISTD_H
110110
#include <unistd.h>
111111
#endif
112+
#define APR_WANT_STRFUNC
113+
#include "apr_want.h"
112114

113115
#ifdef NEXT
114116
#if (NX_CURRENT_COMPILER_RELEASE == 410)

modules/metadata/mod_mime_magic.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126

127127
#include "apr.h"
128128
#include "apr_strings.h"
129+
#include "apr_lib.h"
130+
#define APR_WANT_STRFUNC
131+
#include "apr_want.h"
129132

130133
#if APR_HAVE_UNISTD_H
131134
#include <unistd.h>

modules/metadata/mod_unique_id.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@
7070
#include "http_log.h"
7171
#include "http_protocol.h" /* for ap_hook_post_read_request */
7272

73+
#if APR_HAVE_NETDB_H
74+
#include <netdb.h>
75+
#endif
76+
#if APR_HAVE_ARPA_INET_H
77+
#include <arpa/inet.h>
78+
#endif
79+
#if APR_HAVE_UNISTD_H
80+
#include <unistd.h>
81+
#endif
7382

7483
typedef struct {
7584
unsigned int stamp;

0 commit comments

Comments
 (0)