apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: apr/network_io/win32 sendrecv.c
Date Tue, 28 Sep 2004 16:16:17 GMT
clar        2004/09/28 09:16:17

  Modified:    file_io/win32 readwrite.c
               include  apr.hnw apr.hw
               network_io/win32 sendrecv.c
  Log:
  replaced define for DWORD_MAX with APR_DWORD_MAX
  
  Revision  Changes    Path
  1.82      +2 -2      apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- readwrite.c	22 Sep 2004 18:21:30 -0000	1.81
  +++ readwrite.c	28 Sep 2004 16:16:17 -0000	1.82
  @@ -443,8 +443,8 @@
               bytesleft = thefile->bufpos;           
   
               do {
  -                if (bytesleft > DWORD_MAX) {
  -                    numbytes = DWORD_MAX;
  +                if (bytesleft > APR_DWORD_MAX) {
  +                    numbytes = APR_DWORD_MAX;
                   }
                   else {
                       numbytes = (DWORD)bytesleft;
  
  
  
  1.48      +1 -1      apr/include/apr.hnw
  
  Index: apr.hnw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hnw,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- apr.hnw	24 Sep 2004 16:33:03 -0000	1.47
  +++ apr.hnw	28 Sep 2004 16:16:17 -0000	1.48
  @@ -330,7 +330,7 @@
   #define APR_UINT64_T_HEX_FMT     "llx"
   #define APR_TIME_T_FMT APR_INT64_T_FMT
   
  -#define DWORD_MAX 4294967295    /* 2^32*/
  +#define APR_DWORD_MAX 4294967295    /* 2^32*/
   /** @} */
   
   #ifdef __cplusplus
  
  
  
  1.126     +1 -1      apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- apr.hw	22 Sep 2004 18:21:30 -0000	1.125
  +++ apr.hw	28 Sep 2004 16:16:17 -0000	1.126
  @@ -342,7 +342,7 @@
   #define APR_SIZEOF_VOIDP   4
   #endif
   
  -#define DWORD_MAX 4294967295
  +#define APR_DWORD_MAX 4294967295
   
   /* XXX These simply don't belong here, perhaps in apr_portable.h
    * based on some APR_HAVE_PID/GID/UID?
  
  
  
  1.69      +6 -6      apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- sendrecv.c	22 Sep 2004 18:21:30 -0000	1.68
  +++ sendrecv.c	28 Sep 2004 16:16:17 -0000	1.69
  @@ -107,9 +107,9 @@
       for (i = 0; i < in_vec; i++) {
           cur_len = vec[i].iov_len;
           nvec++;
  -        while (cur_len > DWORD_MAX) {
  +        while (cur_len > APR_DWORD_MAX) {
               nvec++;
  -            cur_len -= DWORD_MAX;
  +            cur_len -= APR_DWORD_MAX;
           } 
       }
   
  @@ -123,11 +123,11 @@
           cur_len = vec[i].iov_len;
           
           do {
  -            if (cur_len > DWORD_MAX) {
  +            if (cur_len > APR_DWORD_MAX) {
                   pWsaBuf[j].buf = base;
  -                pWsaBuf[j].len = DWORD_MAX;
  -                cur_len -= DWORD_MAX;
  -                base += DWORD_MAX;
  +                pWsaBuf[j].len = APR_DWORD_MAX;
  +                cur_len -= APR_DWORD_MAX;
  +                base += APR_DWORD_MAX;
               }
               else {
                   pWsaBuf[j].buf = base;
  
  
  

Mime
View raw message