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

diff --git a/include/http_config.h b/include/http_config.h
index 527407b9c2c902e667fd249ac849358c6f32171f..cba626ea5883d46ff7d6bb27e712c58682d2e175 100644 (file)
--- 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 fdd2e535d8ce42a4798ef2ca0f212175f9d915df..43824dc8c92261f3a8f283c52874824c70a0beda 100644 (file)
--- 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 0b537e253dde6096b0cdfd6a7d3d5326ea61aeae..f05cb2111228188715c3c70f3c3c21e684042a4b 100644 (file)
--- 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 9a09b7d3105960f95ecae958f0f0898a091e864a..60f9912e894e17cfba49205821176f2fcb3017e8 100644 (file)
--- 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 f2619ed7d408ec9d588cc45849ffe5f7cf19e4e6..def77deab9b75c7590709f6871aae1e4507447a2 100644 (file)
--- 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 ce491da76c2b56c53807d3af7f53f0e3cbe92ee2..3fad8aa930cfcdb5c8ed7c750bfa7c7616112963 100644 (file)
--- 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 02c4cb347a2ffd08c78e648ef3634529024031a4..645803a5fd9440348629a8ba85ec61d26467823f 100644 (file)
--- 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"