Export ap_get_parent_scoreboard and ap_get_servers_scoreboard to be

abannert · abannert · commit cbd008ff4bc5 · 2001-12-07T19:06:29.000Z
usable on Win32 and friends. Submitted by: Harrie Hazewinkel <harrie@covalent.net> Reviewed by: Aaron Bannert git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92375 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/include/scoreboard.h b/include/scoreboard.h
@@ -216,8 +216,8 @@ void update_scoreboard_global(void);
 AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid);
 AP_DECLARE(int) ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
 void ap_time_process_request(int child_num, int thread_num, int status);
-worker_score *ap_get_servers_scoreboard(int x, int y);
-process_score *ap_get_parent_scoreboard(int x);
+AP_DECLARE(worker_score *) ap_get_servers_scoreboard(int x, int y);
+AP_DECLARE(process_score *) ap_get_parent_scoreboard(int x);
 
 AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
 AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
diff --git a/server/scoreboard.c b/server/scoreboard.c
@@ -355,7 +355,7 @@ void ap_time_process_request(int child_num, int thread_num, int status)
     put_scoreboard_info(child_num, thread_num, ws);
 }
 
-worker_score *ap_get_servers_scoreboard(int x, int y)
+AP_DECLARE(worker_score *) ap_get_servers_scoreboard(int x, int y)
 {
     if (((x < 0) || (HARD_SERVER_LIMIT < x)) ||
         ((y < 0) || (HARD_THREAD_LIMIT < y))) {
@@ -364,7 +364,7 @@ worker_score *ap_get_servers_scoreboard(int x, int y)
     return(&ap_scoreboard_image->servers[x][y]);
 }
 
-process_score *ap_get_parent_scoreboard(int x)
+AP_DECLARE(process_score *) ap_get_parent_scoreboard(int x)
 {
     if ((x < 0) || (HARD_SERVER_LIMIT < x)) {
         return(NULL); /* Out of range */

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ void ap_time_process_request(int child_num, int thread_num, int status)`
`355`	`355`	`put_scoreboard_info(child_num, thread_num, ws);`
`356`	`356`	`}`
`357`	`357`
`358`		`-worker_score *ap_get_servers_scoreboard(int x, int y)`
	`358`	`+AP_DECLARE(worker_score *) ap_get_servers_scoreboard(int x, int y)`
`359`	`359`	`{`
`360`	`360`	`if (((x < 0) \|\| (HARD_SERVER_LIMIT < x)) \|\|`
`361`	`361`	`((y < 0) \|\| (HARD_THREAD_LIMIT < y))) {`
`@@ -364,7 +364,7 @@ worker_score *ap_get_servers_scoreboard(int x, int y)`
`364`	`364`	`return(&ap_scoreboard_image->servers[x][y]);`
`365`	`365`	`}`
`366`	`366`
`367`		`-process_score *ap_get_parent_scoreboard(int x)`
	`367`	`+AP_DECLARE(process_score *) ap_get_parent_scoreboard(int x)`
`368`	`368`	`{`
`369`	`369`	`if ((x < 0) \|\| (HARD_SERVER_LIMIT < x)) {`
`370`	`370`	`return(NULL); /* Out of range */`