Fixed FTBFS introduced by subversion 1.9. This relates to bug 2528.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit e42c18959be00a4ec623e53d7025ed13ced90adf)

1 files changed, 6 insertions, 13 deletions

diff --git a/src/svnqt/client_ls.cpp b/src/svnqt/client_ls.cpp
index cc4d178..054274c 100644
--- a/src/svnqt/client_ls.cpp
+++ b/src/svnqt/client_ls.cpp
@@ -38,7 +38,6 @@
 // subversion api
 #include "svn_client.h"
 #include "svn_path.h"
-#include "svn_sorts.h"
 //#include "svn_utf.h"
 
 #include "svnqt/dirent.hpp"
@@ -47,12 +46,6 @@
 
 #include "svnqt/helper.hpp"
 
-static int
-compare_items_as_paths (const svn_sort__item_t *a, const svn_sort__item_t *b)
-{
-  return svn_path_compare_paths ((const char *)a->key, (const char *)b->key);
-}
-
 namespace svn
 {
 
@@ -82,7 +75,7 @@ namespace svn
 
     apr_array_header_t *
       array = svn_sort__hash (
-        hash, compare_items_as_paths, pool);
+        hash, svn_sort_compare_items_as_paths, pool);
 
     DirEntries entries;
 
@@ -90,9 +83,9 @@ namespace svn
     {
       const char *entryname;
       svn_dirent_t *dirent;
-      svn_sort__item_t *item;
+      svn_sort_item_type *item;
 
-      item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);
+      item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);
 
       entryname = static_cast<const char *>(item->key);
 
@@ -131,7 +124,7 @@ namespace svn
 
     apr_array_header_t *
       array = svn_sort__hash (
-        hash, compare_items_as_paths, pool);
+        hash, svn_sort_compare_items_as_paths, pool);
 
     DirEntries entries;
 
@@ -140,9 +133,9 @@ namespace svn
       const char *entryname;
       svn_dirent_t *dirent;
       svn_lock_t * lockent;
-      svn_sort__item_t *item;
+      svn_sort_item_type *item;
 
-      item = &APR_ARRAY_IDX (array, i, svn_sort__item_t);
+      item = &APR_ARRAY_IDX (array, i, svn_sort_item_type);
 
       entryname = static_cast<const char *>(item->key);