diff options
| -rw-r--r-- | file_io/win32/readwrite.c | 4 | ||||
| -rw-r--r-- | include/apr.hnw | 2 | ||||
| -rw-r--r-- | include/apr.hw | 2 | ||||
| -rw-r--r-- | network_io/win32/sendrecv.c | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index 4062969b5..7a5931387 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -443,8 +443,8 @@ APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile) bytesleft = thefile->bufpos; do { - if (bytesleft > DWORD_MAX) { - numbytes = DWORD_MAX; + if (bytesleft > APR_DWORD_MAX) { + numbytes = APR_DWORD_MAX; } else { numbytes = (DWORD)bytesleft; diff --git a/include/apr.hnw b/include/apr.hnw index 1fab3814f..2938f8fd1 100644 --- a/include/apr.hnw +++ b/include/apr.hnw @@ -330,7 +330,7 @@ typedef int apr_wait_t; #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 diff --git a/include/apr.hw b/include/apr.hw index 372008338..b6897525d 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -342,7 +342,7 @@ typedef int apr_socklen_t; #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? diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index 80297992a..11573fdad 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -107,9 +107,9 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, 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 @@ APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, 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; |