From 6f79dac4838380a6452c393c2064b78effa2f9d7 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Mon, 20 Aug 2012 10:09:42 +0000 Subject: [PATCH] Move *_DECLARE_* macros to beginning of line in headers. Patch submitted by: normw gknw net. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374963 13f79535-47bb-0310-9956-ffa450edef68 --- include/http_core.h | 8 ++++---- include/http_log.h | 2 +- include/mod_core.h | 12 ++++++------ modules/proxy/proxy_util.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/http_core.h b/include/http_core.h index 8cbedc11c3..268f9669ad 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -741,10 +741,10 @@ typedef struct { } ap_mgmt_item_t; /* Handles for core filters */ -extern AP_DECLARE_DATA ap_filter_rec_t *ap_subreq_core_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_output_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_content_length_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_subreq_core_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_core_output_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_content_length_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_core_input_filter_handle; /** * This hook provdes a way for modules to provide metrics/statistics about diff --git a/include/http_log.h b/include/http_log.h index 7fc31a6f07..55a883f352 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -263,7 +263,7 @@ static int * const aplog_module_index; #define APLOGctrace7(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE7) #define APLOGctrace8(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE8) -extern int AP_DECLARE_DATA ap_default_loglevel; +AP_DECLARE_DATA extern int ap_default_loglevel; /** * APLOG_MARK is a convenience macro for use as the first three parameters in diff --git a/include/mod_core.h b/include/mod_core.h index 5d8b83c14c..8eab3e12c4 100644 --- a/include/mod_core.h +++ b/include/mod_core.h @@ -39,11 +39,11 @@ extern "C" { #endif /* Handles for core filters */ -extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_input_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_header_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_http_outerror_filter_handle; -extern AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_input_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_header_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_chunk_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_http_outerror_filter_handle; +AP_DECLARE_DATA extern ap_filter_rec_t *ap_byterange_filter_handle; /* * These (input) filters are internal to the mod_core operation. @@ -88,7 +88,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r); AP_DECLARE(int) ap_send_http_options(request_rec *r); /* Used for multipart/byteranges boundary string */ -extern AP_DECLARE_DATA const char *ap_multipart_boundary; +AP_DECLARE_DATA extern const char *ap_multipart_boundary; /* Init RNG at startup */ AP_CORE_DECLARE(void) ap_init_rng(apr_pool_t *p); diff --git a/modules/proxy/proxy_util.h b/modules/proxy/proxy_util.h index 3b32cc052a..202be8d653 100644 --- a/modules/proxy/proxy_util.h +++ b/modules/proxy/proxy_util.h @@ -31,9 +31,9 @@ PROXY_DECLARE(int) ap_proxy_is_domainname(struct dirconn_entry *This, apr_pool_t PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t *p); PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p); -extern int PROXY_DECLARE_DATA proxy_lb_workers; -extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_path; -extern const apr_strmatch_pattern PROXY_DECLARE_DATA *ap_proxy_strmatch_domain; +PROXY_DECLARE_DATA extern int proxy_lb_workers; +PROXY_DECLARE_DATA extern const apr_strmatch_pattern *ap_proxy_strmatch_path; +PROXY_DECLARE_DATA extern const apr_strmatch_pattern *ap_proxy_strmatch_domain; /** * Register optional functions declared within proxy_util.c. -- 2.40.0