Commit 92d6574e authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Normalize the use of AP_DECLARE_DATA


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87733 13f79535-47bb-0310-9956-ffa450edef68
parent 36776ff1

include/http_config.h

+4 −4
Original line number Diff line number Diff line
@@ -726,23 +726,23 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden 
 * The topmost module in the list

 * @defvar module *top_module

 */

extern AP_DECLARE_DATA module *top_module;

AP_DECLARE_DATA extern module *top_module;



/**

 * Array of all statically linked modules

 * @defvar module *ap_prelinked_modules[]

 */

extern AP_DECLARE_DATA module *ap_prelinked_modules[];

AP_DECLARE_DATA extern module *ap_prelinked_modules[];

/**

 * Array of all preloaded modules

 * @defvar module *ap_preloaded_modules[]

 */

extern AP_DECLARE_DATA module *ap_preloaded_modules[];

AP_DECLARE_DATA extern module *ap_preloaded_modules[];

/**

 * Array of all loaded modules

 * @defvar module **ap_loaded_modules

 */

extern AP_DECLARE_DATA module **ap_loaded_modules;

AP_DECLARE_DATA extern module **ap_loaded_modules;



/* For mod_so.c... */

/** Run a single module's two create_config hooks

include/http_core.h

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ AP_DECLARE(file_type_e) ap_get_win32_interpreter(const request_rec *, 


char *ap_response_code_string (request_rec *r, int error_index);



extern AP_DECLARE_DATA module core_module;

AP_DECLARE_DATA extern module core_module;



/* Per-request configuration */

include/http_main.h

+5 −5
Original line number Diff line number Diff line
@@ -74,20 +74,20 @@ extern "C" { 
 */



/** The name of the Apache executable */

extern AP_DECLARE_DATA const char *ap_server_argv0;

AP_DECLARE_DATA extern const char *ap_server_argv0;

/** The global server's ServerRoot */

extern AP_DECLARE_DATA const char *ap_server_root;

AP_DECLARE_DATA extern const char *ap_server_root;



/* for -C, -c and -D switches */

/** An array of all -C directives.  These are processed before the server's

 *  config file */

extern AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;

AP_DECLARE_DATA extern apr_array_header_t *ap_server_pre_read_config;

/** An array of all -c directives.  These are processed after the server's

 *  config file */

extern AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;

AP_DECLARE_DATA extern apr_array_header_t *ap_server_post_read_config;

/** An array of all -D defines on the command line.  This allows people to

 *  effect the server based on command line options */

extern AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;

AP_DECLARE_DATA extern apr_array_header_t *ap_server_config_defines;



#ifdef __cplusplus

}

include/util_cfgtree.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct ap_directive_t { 
 * The root of the configuration tree

 * @defvar ap_directive_t *conftree

 */

extern AP_DECLARE_DATA ap_directive_t *ap_conftree;

AP_DECLARE_DATA extern ap_directive_t *ap_conftree;



/**

 * Add a node to the configuration tree.

os/win32/modules.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ extern module action_module; 
extern module setenvif_module;

extern module isapi_module;



module AP_DECLARE_DATA *ap_prelinked_modules[] = {

AP_DECLARE_DATA module *ap_prelinked_modules[] = {

  &core_module,

  &mpm_winnt_module,

  &so_module,
@@ -50,7 +50,7 @@ module AP_DECLARE_DATA *ap_prelinked_modules[] = { 
  &isapi_module,

  NULL

};

module *ap_preloaded_modules[] = {

AP_DECLARE_DATA module *ap_preloaded_modules[] = {

  &core_module,

  &mpm_winnt_module,

  &so_module,