httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 os.h
Date Wed, 29 Nov 2000 01:50:03 GMT
wrowe       00/11/28 17:50:03

  Modified:    src/modules/mpm/winnt mpm_winnt.c
               src/os/win32 os.h
  Log:
    clean up some really bad typedefs - and move one into mpm_winnt.c since
    that's the only module remaining that needs it.  Should be an apr type,
    but we aren't using the apr accessors to handle them.
  
  Revision  Changes    Path
  1.112     +9 -11     apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- mpm_winnt.c	2000/11/17 17:11:07	1.111
  +++ mpm_winnt.c	2000/11/29 01:50:02	1.112
  @@ -73,6 +73,8 @@
   #include "mpm_winnt.h"
   #include "mpm_common.h"
   
  +typedef HANDLE thread;
  +
   /*
    * Definitions of WINNT MPM specific config globals
    */
  @@ -111,8 +113,8 @@
   int ap_max_requests_per_child=0;
   int ap_daemons_to_start=0;
   
  -static event *exit_event;
  -HANDLE maintenance_event;
  +static HANDLE exit_event;
  +static HANDLE maintenance_event;
   apr_lock_t *start_mutex;
   DWORD my_pid;
   DWORD parent_pid;
  @@ -154,17 +156,13 @@
   /* A bunch or routines from os/win32/multithread.c that need to be merged into APR
    * or thrown out entirely...
    */
  -
  -typedef void semaphore;
  -typedef void event;
   
  -static semaphore *
  -create_semaphore(int initial)
  +static HANDLE create_semaphore(int initial)
   {
       return(CreateSemaphore(NULL, initial, 1000000, NULL));
   }
   
  -static void acquire_semaphore(semaphore *semaphore_id)
  +static void acquire_semaphore(HANDLE semaphore_id)
   {
       int rv;
       
  @@ -173,12 +171,12 @@
       return;
   }
   
  -static int release_semaphore(semaphore *semaphore_id)
  +static int release_semaphore(HANDLE semaphore_id)
   {
       return(ReleaseSemaphore(semaphore_id, 1, NULL));
   }
   
  -static void destroy_semaphore(semaphore *semaphore_id)
  +static void destroy_semaphore(HANDLE semaphore_id)
   {
       CloseHandle(semaphore_id);
   }
  @@ -599,7 +597,7 @@
    */
   
   typedef struct globals_s {
  -    semaphore *jobsemaphore;
  +    HANDLE jobsemaphore;
       joblist *jobhead;
       joblist *jobtail;
       apr_lock_t *jobmutex;
  
  
  
  1.45      +0 -4      apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- os.h	2000/11/10 15:29:06	1.44
  +++ os.h	2000/11/29 01:50:02	1.45
  @@ -129,8 +129,4 @@
   AP_DECLARE(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
   AP_DECLARE(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
   
  -typedef void thread;
  -typedef void event;
  -
  -
   #endif   /* ! APACHE_OS_H */
  
  
  

Mime
View raw message