You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/05/16 07:33:28 UTC
cvs commit: apr/threadproc/win32 proc.c
wrowe 01/05/15 22:33:28
Modified: file_io/win32 readwrite.c
include apr.hw
network_io/win32 sendrecv.c
threadproc/win32 proc.c
Log:
A touch of fixes for win32. Lots more wrong apr_size_t vs apr_off_t
assumptions to correct, though.
Revision Changes Path
1.58 +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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- readwrite.c 2001/05/07 18:04:13 1.57
+++ readwrite.c 2001/05/16 05:33:26 1.58
@@ -236,7 +236,7 @@
if (thefile->direction == 0) {
// Position file pointer for writing at the offset we are logically reading from
- apr_size_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
+ apr_off_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
if (offset != thefile->filePtr)
SetFilePointer(thefile->filehand, offset, NULL, FILE_BEGIN);
thefile->bufpos = thefile->dataRead = 0;
@@ -282,7 +282,7 @@
apr_size_t *nbytes)
{
apr_status_t rv = APR_SUCCESS;
- int i;
+ apr_size_t i;
DWORD bwrote = 0;
char *buf;
1.65 +1 -1 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- apr.hw 2001/05/15 14:15:37 1.64
+++ apr.hw 2001/05/16 05:33:26 1.65
@@ -229,7 +229,7 @@
typedef size_t apr_size_t;
typedef ptrdiff_t apr_ssize_t;
typedef _off_t apr_off_t;
-typedef size_t apr_socklen_t;
+typedef int apr_socklen_t;
typedef int pid_t;
typedef int uid_t;
typedef int gid_t;
1.39 +1 -1 apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sendrecv.c 2001/05/02 19:59:54 1.38
+++ sendrecv.c 2001/05/16 05:33:27 1.39
@@ -121,7 +121,7 @@
APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t *sock,
const struct iovec *vec,
- apr_int32_t nvec, apr_int32_t *nbytes)
+ apr_int32_t nvec, apr_size_t *nbytes)
{
apr_ssize_t rv;
int i;
1.45 +1 -1 apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- proc.c 2001/02/16 04:16:20 1.44
+++ proc.c 2001/05/16 05:33:27 1.45
@@ -323,7 +323,7 @@
apr_procattr_t *attr,
apr_pool_t *cont)
{
- int i, iEnvBlockLen;
+ apr_size_t i, iEnvBlockLen;
char *cmdline;
char ppid[20];
char *envstr;