You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/04/07 10:44:15 UTC
svn commit: r645412 - in /httpd/httpd/trunk/include: http_config.h
http_connection.h http_core.h http_log.h http_protocol.h http_request.h
httpd.h
Author: pquerna
Date: Mon Apr 7 01:44:14 2008
New Revision: 645412
URL: http://svn.apache.org/viewvc?rev=645412&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/include/http_config.h
httpd/httpd/trunk/include/http_connection.h
httpd/httpd/trunk/include/http_core.h
httpd/httpd/trunk/include/http_log.h
httpd/httpd/trunk/include/http_protocol.h
httpd/httpd/trunk/include/http_request.h
httpd/httpd/trunk/include/httpd.h
Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Mon Apr 7 01:44:14 2008
@@ -721,8 +721,6 @@
/** @} */
-#ifdef CORE_PRIVATE
-
/**
* @brief This structure is used to assign symbol names to module pointers
*/
@@ -961,8 +959,6 @@
ap_conf_vector_t *section_vector,
const char *section,
module *mod, apr_pool_t *pconf);
-
-#endif
/* Hooks */
Modified: httpd/httpd/trunk/include/http_connection.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_connection.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_connection.h (original)
+++ httpd/httpd/trunk/include/http_connection.h Mon Apr 7 01:44:14 2008
@@ -38,7 +38,6 @@
* @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 @@
* @param c The connection we are closing
*/
AP_DECLARE(void) ap_lingering_close(conn_rec *c);
-#endif
/* Hooks */
/**
Modified: httpd/httpd/trunk/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_core.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_core.h (original)
+++ httpd/httpd/trunk/include/http_core.h Mon Apr 7 01:44:14 2008
@@ -307,8 +307,6 @@
*/
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 @@
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);
Modified: httpd/httpd/trunk/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_log.h (original)
+++ httpd/httpd/trunk/include/http_log.h Mon Apr 7 01:44:14 2008
@@ -121,8 +121,6 @@
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.
@@ -132,8 +130,6 @@
* internal core function
*/
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,
Modified: httpd/httpd/trunk/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_protocol.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_protocol.h (original)
+++ httpd/httpd/trunk/include/http_protocol.h Mon Apr 7 01:44:14 2008
@@ -140,13 +140,11 @@
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
Modified: httpd/httpd/trunk/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_request.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_request.h (original)
+++ httpd/httpd/trunk/include/http_request.h Mon Apr 7 01:44:14 2008
@@ -308,7 +308,6 @@
#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 @@
* @param r The current request
*/
AP_DECLARE(void) ap_die(int type, request_rec *r);
-#endif
/* Hooks */
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=645412&r1=645411&r2=645412&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Mon Apr 7 01:44:14 2008
@@ -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
@@ -209,8 +207,6 @@
* enabled. Overridden with AddDefaultCharsetName.
*/
#define DEFAULT_ADD_DEFAULT_CHARSET_NAME "iso-8859-1"
-
-#endif /* CORE_PRIVATE */
/** default HTTP Server protocol */
#define AP_SERVER_PROTOCOL "HTTP/1.1"