summaryrefslogtreecommitdiff
path: root/include/apr_want.h
diff options
context:
space:
mode:
authorjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2006-07-12 02:09:05 +0000
committerjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2006-07-12 02:09:05 +0000
commit03c04dc3f103b89e3925b003c425129d7cfd311b (patch)
tree4b24bbab9e4c792313ea4cdbb72558469a439eb1 /include/apr_want.h
parent3482aecee74c46c0ff0e7f773a323a115883b695 (diff)
downloadlibapr-03c04dc3f103b89e3925b003c425129d7cfd311b.tar.gz
Define struct iovec for mingw.
This patch also moves the iovec 'workaround' from apr.hw into apr_want.h too. Originally titled: [patch 09/17] struct iovec Submitted by: John Mark Vandenberg Reviewed by: Justin Erenkrantz git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@421075 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_want.h')
-rw-r--r--include/apr_want.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/include/apr_want.h b/include/apr_want.h
index c7556a792..b0da0a0c9 100644
--- a/include/apr_want.h
+++ b/include/apr_want.h
@@ -81,10 +81,28 @@
#ifdef APR_WANT_IOVEC
+#if APR_HAVE_IOVEC
+
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
+#else
+
+struct iovec
+{
+ char *iov_base;
+ int iov_len;
+};
+
+#endif
+
+/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
+ * now to ensure that our struct is not introduced several times.
+ */
+#undef APR_HAVE_IOVEC
+#define APR_HAVE_IOVEC 1
+
#undef APR_WANT_IOVEC
#endif