summaryrefslogtreecommitdiff
path: root/subversion/include/private/ra_svn_sasl.h
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2018-05-08 03:44:38 +0000
committerPeter Wemm <peter@FreeBSD.org>2018-05-08 03:44:38 +0000
commit3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch)
tree7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/include/private/ra_svn_sasl.h
parenta55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff)
Diffstat (limited to 'subversion/include/private/ra_svn_sasl.h')
-rw-r--r--subversion/include/private/ra_svn_sasl.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/subversion/include/private/ra_svn_sasl.h b/subversion/include/private/ra_svn_sasl.h
index 428e20e8033c6..e8284517a83a8 100644
--- a/subversion/include/private/ra_svn_sasl.h
+++ b/subversion/include/private/ra_svn_sasl.h
@@ -27,14 +27,8 @@
#ifndef RA_SVN_SASL_H
#define RA_SVN_SASL_H
-#ifdef WIN32
-/* This prevents sasl.h from redefining iovec, which is always defined by APR
- on win32. */
-#define STRUCT_IOVEC_DEFINED
-#include <sasl.h>
-#else
-#include <sasl/sasl.h>
-#endif
+/* Keep this include statement at the top of this file. */
+#include "private/ra_svn_wrapped_sasl.h"
#include <apr_errno.h>
#include <apr_pools.h>