From 5e415009f36005803cc9f9054e84c1913c5f5476 Mon Sep 17 00:00:00 2001 From: Paul Querna Date: Mon, 7 Apr 2008 08:44:14 +0000 Subject: [PATCH] Remove CORE_PRIVATE. This define serves no modern purpose, since every module in the wild, including our own define it, for no purpose. If you have functions which you do not want in the 'public' API, put them in a private header, that is not installed, just like mod_ssl does. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645412 13f79535-47bb-0310-9956-ffa450edef68 --- include/http_config.h | 4 ---- include/http_connection.h | 2 -- include/http_core.h | 3 --- include/http_log.h | 4 ---- include/http_protocol.h | 2 -- include/http_request.h | 2 -- include/httpd.h | 4 ---- 7 files changed, 21 deletions(-) diff --git a/include/http_config.h b/include/http_config.h index 527407b9c2..cba626ea58 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -721,8 +721,6 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, /** @} */ -#ifdef CORE_PRIVATE - /** * @brief This structure is used to assign symbol names to module pointers */ @@ -962,8 +960,6 @@ AP_CORE_DECLARE(void *) ap_set_config_vectors(server_rec *server, const char *section, module *mod, apr_pool_t *pconf); -#endif - /* Hooks */ /** diff --git a/include/http_connection.h b/include/http_connection.h index fdd2e535d8..43824dc8c9 100644 --- a/include/http_connection.h +++ b/include/http_connection.h @@ -38,7 +38,6 @@ extern "C" { * @brief Apache connection library */ -#ifdef CORE_PRIVATE /** * This is the protocol module driver. This calls all of the * pre-connection and connection hooks for all protocol modules. @@ -71,7 +70,6 @@ AP_CORE_DECLARE(void) ap_flush_conn(conn_rec *c); * @param c The connection we are closing */ AP_DECLARE(void) ap_lingering_close(conn_rec *c); -#endif /* Hooks */ /** diff --git a/include/http_core.h b/include/http_core.h index 0b537e253d..f05cb21112 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -307,8 +307,6 @@ AP_DECLARE(const char *) ap_auth_name(request_rec *r); */ AP_DECLARE(int) ap_satisfies(request_rec *r); -#ifdef CORE_PRIVATE - /** * Core is also unlike other modules in being implemented in more than * one file... so, data structures are declared here, even though most of @@ -599,7 +597,6 @@ int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b, apr_off_t readbytes); apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *b); -#endif /* CORE_PRIVATE */ AP_DECLARE(const char*) ap_get_server_protocol(server_rec* s); AP_DECLARE(void) ap_set_server_protocol(server_rec* s, const char* proto); diff --git a/include/http_log.h b/include/http_log.h index 9a09b7d310..60f9912e89 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -121,8 +121,6 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p, int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s_main); -#ifdef CORE_PRIVATE - /** * Perform special processing for piped loggers in MPM child * processes. @@ -133,8 +131,6 @@ int ap_open_logs(apr_pool_t *pconf, apr_pool_t *plog, */ void ap_logs_child_init(apr_pool_t *p, server_rec *s); -#endif /* CORE_PRIVATE */ - /* * The primary logging functions, ap_log_error, ap_log_rerror, ap_log_cerror, * and ap_log_perror use a printf style format string to build the log message. diff --git a/include/http_protocol.h b/include/http_protocol.h index f2619ed7d4..def77deab9 100644 --- a/include/http_protocol.h +++ b/include/http_protocol.h @@ -140,13 +140,11 @@ AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime); AP_DECLARE(const char *) ap_make_content_type(request_rec *r, const char *type); -#ifdef CORE_PRIVATE /** * Precompile metadata structures used by ap_make_content_type() * @param pool The pool to use for allocations */ AP_DECLARE(void) ap_setup_make_content_type(apr_pool_t *pool); -#endif /* CORE_PRIVATE */ /** * Construct an entity tag from the resource information. If it's a real diff --git a/include/http_request.h b/include/http_request.h index ce491da76c..3fad8aa930 100644 --- a/include/http_request.h +++ b/include/http_request.h @@ -308,7 +308,6 @@ AP_DECLARE(void) ap_allow_standard_methods(request_rec *r, int reset, ...); #define MERGE_ALLOW 0 #define REPLACE_ALLOW 1 -#ifdef CORE_PRIVATE /** * Process a top-level request from a client, and synchronously write * the response to the client @@ -330,7 +329,6 @@ void ap_process_async_request(request_rec *); * @param r The current request */ AP_DECLARE(void) ap_die(int type, request_rec *r); -#endif /* Hooks */ diff --git a/include/httpd.h b/include/httpd.h index 02c4cb347a..645803a5fd 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -68,8 +68,6 @@ extern "C" { #endif -#ifdef CORE_PRIVATE - /* ----------------------------- config dir ------------------------------ */ /** Define this to be the default server home dir. Most things later in this @@ -210,8 +208,6 @@ extern "C" { */ #define DEFAULT_ADD_DEFAULT_CHARSET_NAME "iso-8859-1" -#endif /* CORE_PRIVATE */ - /** default HTTP Server protocol */ #define AP_SERVER_PROTOCOL "HTTP/1.1" -- 2.40.0