httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/os/unix iol_socket.c
Date Sat, 28 Aug 1999 12:22:13 GMT
rse         99/08/28 05:22:12

  Modified:    src/main alloc.c buff.c http_connection.c http_main.c
                        http_protocol.c
               src/os/unix iol_socket.c
  Log:
  Make ``configure --with-option=devel'' under
  GCC 2.95.1 happy by avoiding various warnings...
  
  Revision  Changes    Path
  1.7       +2 -0      apache-2.0/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- alloc.c	1999/08/27 22:57:05	1.6
  +++ alloc.c	1999/08/28 12:22:09	1.7
  @@ -201,7 +201,9 @@
   
   static union block_hdr *block_freelist = NULL;
   static ap_thread_mutex *alloc_mutex;
  +#ifdef WIN32
   static ap_thread_mutex *spawn_mutex; /* Added back in for WIN32... */
  +#endif
   
   #ifdef POOL_DEBUG
   static char *known_stack_point;
  
  
  
  1.3       +1 -1      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buff.c	1999/08/26 10:45:55	1.2
  +++ buff.c	1999/08/28 12:22:09	1.3
  @@ -601,7 +601,7 @@
   
       ap_assert(nbyte > 0);
       if (fb->outcnt) {
  -	vec[0].iov_base = fb->outbase;
  +	vec[0].iov_base = (void *)fb->outbase;
   	vec[0].iov_len = fb->outcnt;
   	vec[1].iov_base = (void *)buf;
   	vec[1].iov_len = nbyte;
  
  
  
  1.18      +1 -1      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- http_connection.c	1999/08/13 06:57:40	1.17
  +++ http_connection.c	1999/08/28 12:22:09	1.18
  @@ -67,7 +67,7 @@
   HOOK_STRUCT(
   	    HOOK_LINK(pre_connection)
   	    HOOK_LINK(process_connection)
  -);
  +)
   
   IMPLEMENT_HOOK_VOID(pre_connection,(conn_rec *c),(c))
   IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
  
  
  
  1.4       +3 -1      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- http_main.c	1999/08/27 22:57:07	1.3
  +++ http_main.c	1999/08/28 12:22:10	1.4
  @@ -233,6 +233,9 @@
   }
   
   pool *g_pHookPool;
  +
  +extern char *optarg;
  +
   #ifdef WIN32
   __declspec(dllexport)
        int apache_main(int argc, char *argv[])
  @@ -251,7 +254,6 @@
       pool *plog;			/* Pool for error-logging files */
       pool *ptemp;		/* Pool for temporart config stuff */
       pool *pcommands;		/* Pool for -C and -c switches */
  -    extern char *optarg;
   
       /* TODO: PATHSEPARATOR should be one of the os defines */
   #define PATHSEPARATOR '/'
  
  
  
  1.12      +1 -1      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- http_protocol.c	1999/08/27 22:18:48	1.11
  +++ http_protocol.c	1999/08/28 12:22:10	1.12
  @@ -80,7 +80,7 @@
   	    HOOK_LINK(log_transaction)
   	    HOOK_LINK(http_method)
   	    HOOK_LINK(default_port)
  -);
  +)
   
   #define SET_BYTES_SENT(r) \
     do { if (r->sent_bodyct) \
  
  
  
  1.4       +1 -0      apache-2.0/src/os/unix/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- iol_socket.c	1999/08/13 15:52:01	1.3
  +++ iol_socket.c	1999/08/28 12:22:12	1.4
  @@ -58,6 +58,7 @@
   
   #include "httpd.h"
   #include "ap_iol.h"
  +#include "iol_socket.h"
   
   #include <errno.h>
   #include <sys/types.h>
  
  
  

Mime
View raw message