From: Ryan Bloom Date: Wed, 19 Jan 2000 02:42:17 +0000 (+0000) Subject: Manoj has been pushing for this for a while, but I've been too dense X-Git-Tag: 1.3.13~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=505fa49a3adcc291fab161d55a3e2ff131dfa0bf;p=apache Manoj has been pushing for this for a while, but I've been too dense to understand that he was right. :-) Basically, this makes the modules use ap_config to test for header file inclusion. This method is not to be used for larger modules that run autoconf theirselves. Including ap_config is only valid for modules which rely on Apache to do their configuration. Currently, this is only the core modules. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84497 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/httpd.h b/include/httpd.h index decab3910d..3386b786a0 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -377,7 +377,7 @@ enum server_token_type { API_EXPORT(const char *) ap_get_server_version(void); API_EXPORT(void) ap_add_version_component(const char *component); #else -#define ap_get_server_version() (SERVER_BASEVERSION) +#define ap_get_server_version() (AP_SERVER_BASEVERSION) #define ap_add_version_component(x) ((void)0) #endif API_EXPORT(const char *) ap_get_server_built(void); diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c index 0464598551..752bbe46a4 100644 --- a/modules/aaa/mod_access.c +++ b/modules/aaa/mod_access.c @@ -63,12 +63,15 @@ */ #include "apr_network_io.h" +#include "ap_config.h" #include "httpd.h" #include "http_core.h" #include "http_config.h" #include "http_log.h" #include "http_request.h" +#ifdef HAVE_STRING_H #include +#endif enum allowdeny_type { T_ENV, diff --git a/modules/aaa/mod_auth_db.c b/modules/aaa/mod_auth_db.c index 5d9021f28c..34657e1ae0 100644 --- a/modules/aaa/mod_auth_db.c +++ b/modules/aaa/mod_auth_db.c @@ -90,12 +90,15 @@ * no control is passed along. */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_core.h" #include "http_log.h" #include "http_protocol.h" +#ifdef HAVE_DB_H #include +#endif #if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 2) #define DB2 diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 7caef8c28d..08e2d94c6a 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -84,6 +84,7 @@ #endif #include "modules/perl/mod_perl.h" #else +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" @@ -93,7 +94,7 @@ #include "http_main.h" #include "util_script.h" #include -#ifndef WIN32 +#ifdef HAVE_PWD_H #include #endif #endif diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 7f3944cad8..d439e3acb6 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -64,6 +64,7 @@ * Adapted to Apache by rst. */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_core.h" @@ -73,7 +74,9 @@ #include "http_main.h" #include "util_script.h" #include "apr_fnmatch.h" +#ifdef HAVE_STRING_H #include +#endif module MODULE_VAR_EXPORT autoindex_module; diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 56b4d0f656..67d4197025 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -68,6 +68,7 @@ * they fail. */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" @@ -77,8 +78,12 @@ #include "http_log.h" #include "util_script.h" #include "http_conf_globals.h" +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif module MODULE_VAR_EXPORT cgi_module; diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c index bf61c0ae08..e3478119ea 100644 --- a/modules/http/mod_mime.c +++ b/modules/http/mod_mime.c @@ -64,12 +64,14 @@ #define MIME_PRIVATE +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_log.h" #include "http_request.h" - +#ifdef HAVE_STRING_H #include +#endif typedef struct handlers_info { char *name; diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index a25d6253d8..43e8510470 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -169,12 +169,15 @@ #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b" +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_core.h" /* For REMOTE_NAME */ #include "http_log.h" #include "http_protocol.h" +#ifdef HAVE_LIMITS_H #include +#endif module MODULE_VAR_EXPORT config_log_module; diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c index 579c2f4f13..a6eadbb6f4 100644 --- a/modules/mappers/mod_imap.c +++ b/modules/mappers/mod_imap.c @@ -91,6 +91,7 @@ * Mark Cox, mark@ukweb.com, Allow relative URLs even when no base specified */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" @@ -99,7 +100,9 @@ #include "http_main.h" #include "http_log.h" #include "util_script.h" +#ifdef HAVE_STRING_H #include +#endif #define IMAP_MAGIC_TYPE "application/x-httpd-imap" #define MAXVERTS 100 diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index 531720e242..d5301db7e9 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -62,6 +62,7 @@ * rst */ +#include "ap_config.h" #include "apr_file_io.h" #include "httpd.h" #include "http_config.h" @@ -70,7 +71,9 @@ #include "http_core.h" #include "http_log.h" #include "util_script.h" +#ifdef HAVE_STRING_H #include +#endif #define MAP_FILE_MAGIC_TYPE "application/x-type-map" diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index 9a46df7691..94ef45863d 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -88,7 +88,7 @@ ** www.engelschall.com */ - +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" @@ -103,10 +103,14 @@ #ifndef NO_WRITEV #ifndef NETWARE +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif +#ifdef HAVE_SYS_UIO_H #include #endif +#endif /* ** +-------------------------------------------------------+ diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c index 1880406a4b..ec27429b13 100644 --- a/modules/mappers/mod_userdir.c +++ b/modules/mappers/mod_userdir.c @@ -90,10 +90,11 @@ * disabled, except those explicitly turned on with the "enabled" keyword. */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" -#ifndef WIN32 +#ifdef HAVE_PWD_H #include #endif diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c index 4e68df1e93..dc4d0999a9 100644 --- a/modules/metadata/mod_cern_meta.c +++ b/modules/metadata/mod_cern_meta.c @@ -148,13 +148,18 @@ * 29.Jun.96 All directives made per-directory. */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" -#include -#include #include "util_script.h" #include "http_log.h" #include "http_request.h" +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif #define DIR_CMD_PERMS OR_INDEXES diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c index 3c8c214478..1645807d11 100644 --- a/modules/metadata/mod_env.c +++ b/modules/metadata/mod_env.c @@ -98,10 +98,13 @@ * *** older versions of the module. *** */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" +#ifdef HAVE_STDLIB_H #include +#endif typedef struct { ap_table_t *vars; diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 3577bf0c67..b94ec6a261 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -192,7 +192,10 @@ * Hi, welcome to the internet. */ +#include "ap_config.h" +#ifdef HAVE_CTYPE_H #include +#endif #include "httpd.h" #include "http_config.h" #include "http_log.h" diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index bf48229402..218ee92684 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -123,6 +123,7 @@ * */ +#include "ap_config.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" @@ -130,9 +131,9 @@ #include "http_log.h" #include "http_protocol.h" #include "util_script.h" - +#ifdef HAVE_UTIME_H #include - +#endif /* * data structures and related constants