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, 7 deletions

diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp
index 1c58610..4b437a3 100644
--- a/src/svnqt/client_status.cpp
+++ b/src/svnqt/client_status.cpp
@@ -38,7 +38,6 @@
 
 // Subversion api
 #include "svn_client.h"
-#include "svn_sorts.h"
 #include "svn_path.h"
 //#include "svn_utf.h"
 
@@ -334,11 +333,11 @@ namespace svn
     /* Loop over array, printing each name/status-structure */
     for (i = 0; i < statusarray->nelts; ++i)
     {
-      const svn_sort__item_t *item;
+      const svn_sort_item_type *item;
       const char *filePath;
       svn_wc_status2_t *status = NULL;
 
-      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t);
+      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
       status = (svn_wc_status2_t *) item->value;
 
       filePath = (const char *) item->key;
@@ -462,11 +461,11 @@ namespace svn
     apr_array_header_t *statusarray =
       svn_sort__hash (status_hash, svn_sort_compare_items_as_paths,
                             pool);
-    const svn_sort__item_t *item;
+    const svn_sort_item_type *item;
     const char *filePath;
     svn_wc_status2_t *status = NULL;
 
-    item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort__item_t);
+    item = &APR_ARRAY_IDX (statusarray, 0, const svn_sort_item_type);
     status = (svn_wc_status2_t *) item->value;
     filePath = (const char *) item->key;
 
@@ -715,9 +714,9 @@ namespace svn
     /* Loop over array, printing each name/status-structure */
     for (i=0; i< statusarray->nelts; ++i)
     {
-      const svn_sort__item_t *item;
+      const svn_sort_item_type *item;
       InfoEntry*e = NULL;
-      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort__item_t);
+      item = &APR_ARRAY_IDX (statusarray, i, const svn_sort_item_type);
       e = (InfoEntry *) item->value;
       ientries.push_back(*e);
       delete e;