summaryrefslogtreecommitdiffstats
path: root/server/mpm
diff options
context:
space:
mode:
Diffstat (limited to 'server/mpm')
-rw-r--r--server/mpm/dexter/dexter.c2
-rw-r--r--server/mpm/mpmt_beos/mpmt_beos.c4
-rw-r--r--server/mpm/mpmt_pthread/mpmt_pthread.c6
-rw-r--r--server/mpm/mpmt_pthread/scoreboard.c2
-rw-r--r--server/mpm/mpmt_pthread/scoreboard.h4
-rw-r--r--server/mpm/prefork/prefork.c4
-rw-r--r--server/mpm/prefork/scoreboard.h4
-rw-r--r--server/mpm/spmt_os2/scoreboard.h2
-rw-r--r--server/mpm/spmt_os2/spmt_os2.c2
-rw-r--r--server/mpm/winnt/mpm_winnt.c7
-rw-r--r--server/mpm/winnt/mpm_winnt.h2
-rw-r--r--server/mpm/winnt/registry.c2
-rw-r--r--server/mpm/winnt/service.c5
13 files changed, 24 insertions, 22 deletions
diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 0805cfddfa..4eee463883 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1456,7 +1456,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_dexter_module = {
+module MODULE_EXPORT_VAR mpm_dexter_module = {
MPM20_MODULE_STUFF,
dexter_pre_config, /* run hook before the configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index d912648053..879f38e32e 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -90,7 +90,7 @@ static int min_spare_threads=0;
static int max_spare_threads=0;
static int ap_daemons_limit=0;
static time_t ap_restart_time=0;
-API_VAR_EXPORT int ap_extended_status = 0;
+API_EXPORT_VAR int ap_extended_status = 0;
static int workers_may_exit = 0;
static int requests_this_child;
static int num_listenfds = 0;
@@ -1259,7 +1259,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_mpmt_beos_module = {
+module MODULE_EXPORT_VAR mpm_mpmt_beos_module = {
MPM20_MODULE_STUFF,
mpmt_beos_pre_config, /* hook run before the configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 2c4355fa09..4207e96974 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -88,13 +88,13 @@
int ap_threads_per_child=0; /* Worker threads per child */
int ap_max_requests_per_child=0;
static char *ap_pid_fname=NULL;
-API_VAR_EXPORT char *ap_scoreboard_fname=NULL;
+API_EXPORT_VAR char *ap_scoreboard_fname=NULL;
static int ap_daemons_to_start=0;
static int min_spare_threads=0;
static int max_spare_threads=0;
static int ap_daemons_limit=0;
static time_t ap_restart_time=0;
-API_VAR_EXPORT int ap_extended_status = 0;
+API_EXPORT_VAR int ap_extended_status = 0;
static int workers_may_exit = 0;
static int requests_this_child;
static int num_listensocks = 0;
@@ -1475,7 +1475,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_mpmt_pthread_module = {
+module MODULE_EXPORT_VAR mpm_mpmt_pthread_module = {
MPM20_MODULE_STUFF,
mpmt_pthread_pre_config, /* run hook before the configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/mpmt_pthread/scoreboard.c b/server/mpm/mpmt_pthread/scoreboard.c
index ffda41a9c7..74d57502b2 100644
--- a/server/mpm/mpmt_pthread/scoreboard.c
+++ b/server/mpm/mpmt_pthread/scoreboard.c
@@ -73,7 +73,7 @@
scoreboard *ap_scoreboard_image = NULL;
new_scoreboard *ap_new_scoreboard_image = NULL;
static int maintain_connection_status = 1;
-API_VAR_EXPORT char *ap_scoreboard_fname;
+API_EXPORT_VAR char *ap_scoreboard_fname;
/*****************************************************************
*
* Dealing with the scoreboard... a lot of these variables are global
diff --git a/server/mpm/mpmt_pthread/scoreboard.h b/server/mpm/mpmt_pthread/scoreboard.h
index 9d64c9a191..43ec6c7c21 100644
--- a/server/mpm/mpmt_pthread/scoreboard.h
+++ b/server/mpm/mpmt_pthread/scoreboard.h
@@ -240,9 +240,9 @@ void ap_time_process_request(int child_num, int thread_num, int status);
-API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
+API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
-API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
+API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
/* for time_process_request() in http_main.c */
#define START_PREQUEST 1
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2d5a249864..755b10571f 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -172,7 +172,7 @@ int tpf_child = 0;
char tpf_server_name[INETD_SERVNAME_LENGTH+1];
#endif /* TPF */
-API_VAR_EXPORT scoreboard *ap_scoreboard_image = NULL;
+API_EXPORT_VAR scoreboard *ap_scoreboard_image = NULL;
static new_scoreboard *ap_new_scoreboard_image = NULL;
#ifdef GPROF
@@ -2434,7 +2434,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_prefork_module = {
+module MODULE_EXPORT_VAR mpm_prefork_module = {
MPM20_MODULE_STUFF,
prefork_pre_config, /* run hook before the configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/prefork/scoreboard.h b/server/mpm/prefork/scoreboard.h
index fe4c2589f1..c370f01823 100644
--- a/server/mpm/prefork/scoreboard.h
+++ b/server/mpm/prefork/scoreboard.h
@@ -214,9 +214,9 @@ typedef struct {
API_EXPORT(void) ap_sync_scoreboard_image(void);
API_EXPORT(int) ap_exists_scoreboard_image(void);
-API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
+API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
-API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
+API_EXPORT_VAR extern ap_generation_t volatile ap_my_generation;
/* for time_process_request() in http_main.c */
#define START_PREQUEST 1
diff --git a/server/mpm/spmt_os2/scoreboard.h b/server/mpm/spmt_os2/scoreboard.h
index 27baf2bc39..3d7335fb47 100644
--- a/server/mpm/spmt_os2/scoreboard.h
+++ b/server/mpm/spmt_os2/scoreboard.h
@@ -195,7 +195,7 @@ typedef struct {
API_EXPORT(int) ap_exists_scoreboard_image(void);
-API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
+API_EXPORT_VAR extern scoreboard *ap_scoreboard_image;
/* for time_process_request() in http_main.c */
diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 2d4218e120..ea9061480c 100644
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -1669,7 +1669,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
+module MODULE_EXPORT_VAR mpm_spmt_os2_module = {
MPM20_MODULE_STUFF,
spmt_os2_pre_config, /* hook run before the configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 78c000340b..698a2db7f5 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -57,8 +57,9 @@
*/
#define CORE_PRIVATE
-#include "apr_portable.h"
+#include "ap_config.h"
#include "httpd.h"
+#include "apr_portable.h"
#include "http_main.h"
#include "http_log.h"
#include "http_config.h" /* for read_config */
@@ -105,7 +106,7 @@ HANDLE maintenance_event;
ap_lock_t *start_mutex;
DWORD my_pid;
DWORD parent_pid;
-API_VAR_EXPORT ap_completion_t ap_mpm_init_complete = NULL;
+API_EXPORT_VAR ap_completion_t ap_mpm_init_complete = NULL;
static ap_status_t socket_cleanup(void *sock)
{
@@ -1966,7 +1967,7 @@ LISTEN_COMMANDS
{ NULL }
};
-module MODULE_VAR_EXPORT mpm_winnt_module = {
+module MODULE_EXPORT_VAR mpm_winnt_module = {
MPM20_MODULE_STUFF,
winnt_pre_config, /* hook run before configuration is read */
NULL, /* create per-directory config structure */
diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index e0f7b50620..d53686039d 100644
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -67,7 +67,7 @@ extern int ap_extended_status;
extern void clean_child_exit(int);
typedef void (CALLBACK *ap_completion_t)();
-API_VAR_EXPORT ap_completion_t ap_mpm_init_complete;
+API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
API_EXPORT(void) ap_start_shutdown(void);
diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index ed41d48564..f3e842c44e 100644
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -83,7 +83,7 @@
* HKLM\Software\[Vendor]\[Software]\[Version]\ServerRoot
*/
-#include "os.h"
+#include "ap_config.h"
#include "httpd.h"
#include "http_log.h"
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index 412f25d046..9f5c5b1908 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -61,6 +61,7 @@
#define CORE_PRIVATE
#include "main_win32.h"
+#include "ap_config.h"
#include "httpd.h"
#include "http_conf_globals.h"
#include "http_log.h"
@@ -70,8 +71,8 @@
#include "..\..\modules\mpm\winnt\winnt.h"
typedef void (CALLBACK *ap_completion_t)();
-API_VAR_IMPORT ap_completion_t ap_mpm_init_complete;
-API_VAR_IMPORT char *ap_server_argv0;
+API_EXPORT_VAR ap_completion_t ap_mpm_init_complete;
+API_EXPORT_VAR char *ap_server_argv0;
static struct
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 22:37:36 +0100