You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by aa...@apache.org on 2001/12/07 20:06:29 UTC

cvs commit: httpd-2.0/include scoreboard.h

aaron       01/12/07 11:06:29

  Modified:    server   scoreboard.c
               include  scoreboard.h
  Log:
  Export ap_get_parent_scoreboard and ap_get_servers_scoreboard to be
  usable on Win32 and friends.
  
  Submitted by:	Harrie Hazewinkel <ha...@covalent.net>
  Reviewed by:	Aaron Bannert
  
  Revision  Changes    Path
  1.38      +2 -2      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- scoreboard.c	2001/10/26 15:40:04	1.37
  +++ scoreboard.c	2001/12/07 19:06:28	1.38
  @@ -355,7 +355,7 @@
       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 @@
       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 */
  
  
  
  1.31      +2 -2      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- scoreboard.h	2001/08/01 06:23:00	1.30
  +++ scoreboard.h	2001/12/07 19:06:29	1.31
  @@ -216,8 +216,8 @@
   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;