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

diff --git a/STATUS b/STATUS
index 745d0bcc2084b1a005202e2ef22c7bf4bf3044d4..f8fffcbe6e9856ea72b12fa3e62de482c7f2c814 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2001/02/10 00:33:36 $]
+Last modified at [$Date: 2001/02/10 22:21:22 $]
 
 Release:
 
@@ -178,6 +178,8 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 
     * shift stuff to mod_core.h
 
+    * APR-ize resolver stuff in mod_unique_id (Jeff volunteers)
+
 PRs that have been suspended forever waiting for someone to
 put them into 'the next release':
 

diff --git a/modules/aaa/mod_auth_db.c b/modules/aaa/mod_auth_db.c
index efde731acda4692c2d10cd1cfeceda50727c67b2..1efc977d6480b1102f51a5a59b2b8c1c3b9c4cc9 100644 (file)
--- a/modules/aaa/mod_auth_db.c
+++ b/modules/aaa/mod_auth_db.c
@@ -100,6 +100,9 @@
 #include "http_log.h"
 #include "http_protocol.h"
 #include "http_request.h"  /* for ap_hook_(check_user_id | auth_check) */
+#include "apr_lib.h"
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 #ifdef HAVE_DB_H
 #include <db.h>
 #endif

diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
index 27e9d43590d45703ae1a145fc05214778bba330e..fed27ec0b4415d09092df4644c21ba5c9493b4cb 100644 (file)
--- a/modules/aaa/mod_auth_dbm.c
+++ b/modules/aaa/mod_auth_dbm.c
@@ -77,6 +77,8 @@
 #include "http_protocol.h"
 #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
 #include "apr_lib.h"
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #if defined(AP_AUTH_DBM_USE_APR)
 #include "apr_dbm.h"

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 4738ab5f3447ba74161d55e82a1f1c01bf199a13..89cea21e8c5b87a6d6367a71e041269d8ec981ea 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -109,6 +109,8 @@
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #ifdef NEXT
 #if (NX_CURRENT_COMPILER_RELEASE == 410)

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 67eb4409e2fdfbc8a7bbc0a8e73113640493b931..33d507f913a2b66b71daa9cf49e46abe845a9404 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -126,6 +126,9 @@
 
 #include "apr.h"
 #include "apr_strings.h"
+#include "apr_lib.h"
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 385cf8a2d114610d42d1a637d4216a6bc74b3f08..9fd0d2dca9d1f0686e05930aa498f539bc103b5a 100644 (file)
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -70,6 +70,15 @@
 #include "http_log.h"
 #include "http_protocol.h"  /* for ap_hook_post_read_request */
 
+#if APR_HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#if APR_HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 typedef struct {
     unsigned int stamp;