Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit baf705079fef700935c9d7ec934bff21330139bf 1 parent 2086737
Guenter Knauf authored
View
8 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
View
2  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
View
12 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);
View
6 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.
Please sign in to comment.
Something went wrong with that request. Please try again.