rbb 99/10/13 08:29:22
Modified: src/lib/apr configure.in
src/lib/apr/include apr_file_io.h
src/lib/apr/file_io/unix readwrite.c
Log:
Fix my ap_make_iovec function. APR compiles cleanly again. I could have
sworn this compiled for me last night, but I must have been mistaken.
Revision Changes Path
1.19 +1 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 1999/10/11 14:15:27 1.18
+++ configure.in 1999/10/13 15:29:14 1.19
@@ -157,6 +157,7 @@
AC_CHECK_HEADERS(sys/times.h)
AC_CHECK_HEADERS(tpfeq.h)
AC_CHECK_HEADERS(tpfio.h)
+AC_CHECK_HEADERS(sys/uio.h)
AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(poll.h)
AC_CHECK_HEADERS(unix.h)
1.13 +6 -1 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_file_io.h 1999/10/12 20:00:33 1.12
+++ apr_file_io.h 1999/10/13 15:29:18 1.13
@@ -58,7 +58,12 @@
#include "apr_general.h"
#include "apr_errno.h"
+#ifdef HAVE_TIME_H
#include <time.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
#ifdef __cplusplus
extern "C" {
@@ -125,7 +130,7 @@
API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
__attribute__((format(printf,2,3)));
-ap_status_t ap_make_iov(struct iovec_t **, struct iovec *, ap_context_t *);
+ap_status_t ap_make_iov(ap_iovec_t **, struct iovec *, ap_context_t *);
ap_status_t ap_dupfile(ap_file_t **, ap_file_t *);
ap_status_t ap_getfileinfo(ap_file_t *);
ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *);
1.12 +1 -0 apache-2.0/src/lib/apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- readwrite.c 1999/10/12 20:00:31 1.11
+++ readwrite.c 1999/10/13 15:29:20 1.12
@@ -158,6 +158,7 @@
}
(*new)->cntxt = cntxt;
(*new)->theiov = iova;
+ return APR_SUCCESS;
}
ap_status_t ap_writev(struct file_t *thefile, const struct iovec_t *vec,
ap_ssize_t *iocnt)
