diff options
| author | Michele Calgaro <[email protected]> | 2015-10-18 17:00:26 +0700 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2015-10-19 21:43:07 +0700 |
| commit | e6650503faaec336fca836b99763c5fd41a8ddb2 (patch) | |
| tree | 412fba593b9d456c0e76cd9fcc951e4bd97608d9 /src/svnqt/client_impl.hpp | |
| 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 <[email protected]>
(cherry picked from commit e42c18959be00a4ec623e53d7025ed13ced90adf)
Diffstat (limited to 'src/svnqt/client_impl.hpp')
| -rw-r--r-- | src/svnqt/client_impl.hpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 4e2ea60..4760e39 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -31,6 +31,9 @@ #ifndef _SVNCPP_CLIENT_IMPL_H_ #define _SVNCPP_CLIENT_IMPL_H_ +#include "svn_sorts.h" +#include <svn_version.h> + #include "svnqt/client.hpp" #include "svnqt/svnqt_defines.hpp" @@ -46,6 +49,22 @@ class TQStringList; +#if (SVN_VER_MAJOR == 1 && SVN_VER_MINOR <= 8) +typedef svn_sort__item_t svn_sort_item_type; +#else +// Taken from subversion 1.8.10 source code and modified where needed + +// Same as svn_sort__item_t +typedef struct svn_sort_item_type { + const void *key; // pointer to the key + apr_ssize_t klen; // size of the key + void *value; // pointer to the value +} svn_sort_item_type; + +apr_array_header_t* svn_sort__hash(apr_hash_t *ht, + int (*comparison_func)(const svn_sort__item_t*, const svn_sort__item_t*), apr_pool_t *pool); +#endif + namespace svn { namespace stream { |