Import svn-1.8.4, which includes fixes for both security and merge

handling.

1 files changed, 13 insertions, 0 deletions

diff --git a/subversion/include/private/svn_subr_private.h b/subversion/include/private/svn_subr_private.h
index a45e664..30fbbf2 100644
--- a/subversion/include/private/svn_subr_private.h
+++ b/subversion/include/private/svn_subr_private.h
@@ -26,6 +26,7 @@
 
 #include "svn_types.h"
 #include "svn_io.h"
+#include "svn_version.h"
 
 
 #ifdef __cplusplus
@@ -331,6 +332,18 @@ svn_version__at_least(svn_version_t *version,
                       int minor,
                       int patch);
 
+/** Like svn_ver_check_list(), but with a @a comparator parameter.
+ * Private backport of svn_ver_check_list2() from trunk.
+ */
+svn_error_t *
+svn_ver__check_list2(const svn_version_t *my_version,
+                     const svn_version_checklist_t *checklist,
+                     svn_boolean_t (*comparator)(const svn_version_t *,
+                                                 const svn_version_t *));
+
+/** To minimize merge churn in callers, alias the trunk name privately. */
+#define svn_ver_check_list2 svn_ver__check_list2
+
 /** @} */
 
 #ifdef __cplusplus