Date: 24 Dec 1998 13:39:49 -0000
Message-ID: <19981224133949.19793.qmail@hyperreal.org>
From: jim@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/main http_main.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

jim         98/12/24 05:39:49

  Modified:    src/include scoreboard.h
               src/main http_main.c
  Log:
  Good catch by Ben Hyde.
  
  Revision  Changes    Path
  1.45      +1 -1      apache-1.3/src/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/scoreboard.h,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- scoreboard.h	1998/12/04 19:12:15	1.44
  +++ scoreboard.h	1998/12/24 13:39:47	1.45
  @@ -189,7 +189,7 @@
   
   API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
   
  -API_VAR_EXPORT extern ap_generation_t ap_my_generation;
  +API_VAR_EXPORT extern ap_generation_t volatile ap_my_generation;
   
   /* for time_process_request() in http_main.c */
   #define START_PREQUEST 1
  
  
  
  1.414     +1 -1      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.413
  retrieving revision 1.414
  diff -u -r1.413 -r1.414
  --- http_main.c	1998/12/23 00:14:10	1.413
  +++ http_main.c	1998/12/24 13:39:48	1.414
  @@ -2568,7 +2568,7 @@
   static int volatile shutdown_pending;
   static int volatile restart_pending;
   static int volatile is_graceful;
  -int volatile ap_my_generation;
  +ap_generation_t volatile ap_my_generation;
   
   #ifdef WIN32
   /*