httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Tue, 05 Oct 2004 21:04:20 GMT
ake         2004/10/05 14:04:20

  Modified:    server/mpm/winnt child.c
  Log:
  WIN64: SOCKET is not int on 64bit platforms
  
  Revision  Changes    Path
  1.39      +6 -6      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- child.c	22 Sep 2004 18:21:30 -0000	1.38
  +++ child.c	5 Oct 2004 21:04:19 -0000	1.39
  @@ -253,7 +253,7 @@
   
   typedef struct joblist_s {
       struct joblist_s *next;
  -    int sock;
  +    SOCKET sock;
   } joblist;
   
   typedef struct globals_s {
  @@ -269,7 +269,7 @@
   #define MAX_SELECT_ERRORS 100
   
   
  -static void add_job(int sock)
  +static void add_job(SOCKET sock)
   {
       joblist *new_job;
   
  @@ -296,10 +296,10 @@
   }
   
   
  -static int remove_job(void)
  +static SOCKET remove_job(void)
   {
       joblist *job;
  -    int sock;
  +    SOCKET sock;
   
       WaitForSingleObject(allowed_globals.jobsemaphore, INFINITE);
       apr_thread_mutex_lock(allowed_globals.jobmutex);
  @@ -326,7 +326,7 @@
       struct timeval tv;
       fd_set main_fds;
       int wait_time = 1;
  -    int csd;
  +    SOCKET csd;
       SOCKET nsd = INVALID_SOCKET;
       int count_select_errors = 0;
       int rc;
  @@ -363,7 +363,7 @@
   	tv.tv_usec = 0;
   	memcpy(&main_fds, &listenfds, sizeof(fd_set));
   
  -	rc = select(listenmaxfd + 1, &main_fds, NULL, NULL, &tv);
  +	rc = select((int)(listenmaxfd + 1), &main_fds, NULL, NULL, &tv);
   
           if (rc == 0 || (rc == SOCKET_ERROR && APR_STATUS_IS_EINTR(apr_get_netos_error())))
{
               count_select_errors = 0;    /* reset count of errors */            
  
  
  

Mime
View raw message