httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/win32 sendrecv.c
Date Thu, 22 Jun 2000 19:33:23 GMT
rbb         00/06/22 12:33:22

  Modified:    src/lib/apr/include apr.hw
               src/lib/apr/network_io/unix sendrecv.c
               src/lib/apr/network_io/win32 sendrecv.c
  Log:
  I accidentally renamed APR_HAS_SENDFILE to APR_HAVE_SENFILE yesterday.  This
  patch changes it back on all platforms.  This makes APR_HAS_SENDFILE look
  like the rest of the APR function feature macros.  Sorry about the
  inadvertant change.
  
  Revision  Changes    Path
  1.21      +1 -1      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr.hw	2000/06/22 19:09:44	1.20
  +++ apr.hw	2000/06/22 19:33:14	1.21
  @@ -144,7 +144,7 @@
   
   /*  APR Feature Macros */
   #define APR_HAS_THREADS        1
  -#define APR_HAVE_SENDFILE      1
  +#define APR_HAS_SENDFILE      1
   #define APR_HAS_RANDOM         1
   #define APR_HAS_DSO            1
   
  
  
  
  1.26      +4 -4      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- sendrecv.c	2000/06/22 00:36:05	1.25
  +++ sendrecv.c	2000/06/22 19:33:18	1.26
  @@ -65,7 +65,7 @@
   #define READ(x,y,z)   read(x,y,z)
   #endif
   
  -#if APR_HAVE_SENDFILE
  +#if APR_HAS_SENDFILE
   /* This file is needed to allow us access to the ap_file_t internals. */
   #include "../../file_io/unix/fileio.h"
   
  @@ -76,7 +76,7 @@
   #define TCP_CORK 3
   #endif
   
  -#endif /* APR_HAVE_SENDFILE */
  +#endif /* APR_HAS_SENDFILE */
   
   static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read)
   {
  @@ -204,7 +204,7 @@
   }
   #endif
   
  -#if APR_HAVE_SENDFILE
  +#if APR_HAS_SENDFILE
   
    /* TODO: Verify that all platforms handle the fd the same way 
     *     (i.e. not moving current file pointer)
  @@ -555,4 +555,4 @@
       return APR_SUCCESS;
   }
   #endif /* __linux__, __FreeBSD__, __HPUX__, _AIX */
  -#endif /* APR_HAVE_SENDFILE */
  +#endif /* APR_HAS_SENDFILE */
  
  
  
  1.20      +1 -1      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- sendrecv.c	2000/06/22 00:36:06	1.19
  +++ sendrecv.c	2000/06/22 19:33:20	1.20
  @@ -133,7 +133,7 @@
       *nbytes = dwBytes;
       return APR_SUCCESS;
   }
  -#if APR_HAVE_SENDFILE
  +#if APR_HAS_SENDFILE
   /*
    * ap_status_t ap_sendfile(ap_socket_t *, ap_file_t *, ap_hdtr_t *, 
    *                         ap_off_t *, ap_size_t *, ap_int32_t flags)
  
  
  

Mime
View raw message