httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main iol_socket.c
Date Tue, 01 Aug 2000 17:57:56 GMT
trawick     00/08/01 10:57:56

  Modified:    src/main iol_socket.c
  Log:
  If !APR_HAS_SENDFILE, don't implement socket_sendfile(), since it won't
  be used in the declaration of socket_methods.  This avoids a compiler
  warning on systems with no sendfile() (e.g., Solaris (x86, at least)).
  
  Revision  Changes    Path
  1.9       +3 -4      apache-2.0/src/main/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_socket.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- iol_socket.c	2000/07/29 16:24:11	1.8
  +++ iol_socket.c	2000/08/01 17:57:56	1.9
  @@ -131,16 +131,15 @@
       *nbytes = size;
       return ap_recv(((iol_socket *)viol)->sock, buf, nbytes);
   }
  +
  +#if APR_HAS_SENDFILE
   static ap_status_t socket_sendfile(ap_iol *viol, ap_file_t *file,
                                      ap_hdtr_t *hdtr, ap_off_t *offset, 
                                      ap_size_t *len,  ap_int32_t flags) 
   {
  -#if APR_HAS_SENDFILE
       return ap_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
  -#else
  -    return APR_ENOTIMPL;
  -#endif
   }
  +#endif
   
   static ap_status_t socket_close(ap_iol *viol)
   {
  
  
  

Mime
View raw message