summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2011-03-28 05:32:20 +0000
committerGuenter Knauf <fuankg@apache.org>2011-03-28 05:32:20 +0000
commite3e81da330cce738f24fe5e2debebb8e0e00613e (patch)
tree9a5744ed980c72c6fbb3142b3adb34600cb759c2
parent2b5f66c31ee7ef707e7fb04c28c575885ac4a5a5 (diff)
downloadapr-e3e81da330cce738f24fe5e2debebb8e0e00613e.tar.gz
Fixed protection of our own struct iovec define.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@1086125 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--include/apr_want.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/apr_want.h b/include/apr_want.h
index 14fa9d0b4..422431864 100644
--- a/include/apr_want.h
+++ b/include/apr_want.h
@@ -89,19 +89,16 @@
#else
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
struct iovec
{
char *iov_base;
size_t iov_len;
};
+#endif /* !APR_IOVEC_DEFINED */
-#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
+#endif /* APR_HAVE_IOVEC */
#undef APR_WANT_IOVEC
#endif