diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-10-18 17:00:26 +0700 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-10-19 21:43:07 +0700 |
commit | e6650503faaec336fca836b99763c5fd41a8ddb2 (patch) | |
tree | 412fba593b9d456c0e76cd9fcc951e4bd97608d9 /src/svnqt/client_ls.cpp | |
parent | 26944d84f6234cab2705ceb41bf2e54dfddee1c4 (diff) | |
download | tdesvn-e6650503faaec336fca836b99763c5fd41a8ddb2.tar.gz tdesvn-e6650503faaec336fca836b99763c5fd41a8ddb2.zip |
Fixed FTBFS introduced by subversion 1.9. This relates to bug 2528.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e42c18959be00a4ec623e53d7025ed13ced90adf)
Diffstat (limited to 'src/svnqt/client_ls.cpp')
-rw-r--r-- | src/svnqt/client_ls.cpp | 19 |
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); |