diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
| commit | 608944fa5a78d7f517c9c73a7ded6c130cc97b83 (patch) | |
| tree | 9dce7c56ce4cbd36bb5457661d50b23d30c3533c /subversion/include | |
| parent | c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (diff) | |
Notes
Diffstat (limited to 'subversion/include')
| -rw-r--r-- | subversion/include/private/svn_sqlite.h | 3 | ||||
| -rw-r--r-- | subversion/include/svn_version.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/subversion/include/private/svn_sqlite.h b/subversion/include/private/svn_sqlite.h index 6faa5b384f6b9..4c6cb97cd5065 100644 --- a/subversion/include/private/svn_sqlite.h +++ b/subversion/include/private/svn_sqlite.h @@ -555,6 +555,9 @@ svn_sqlite__hotcopy(const char *src_path, const char *dst_path, apr_pool_t *scratch_pool); +/* Backported version of SVN_ERR_SQLITE_ROLLBACK_FAILED. */ +#define SVN_SQLITE__ERR_ROLLBACK_FAILED (SVN_ERR_MISC_CATEGORY_START + 44) + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/subversion/include/svn_version.h b/subversion/include/svn_version.h index 92ce825ced8ca..79e37d9a9b887 100644 --- a/subversion/include/svn_version.h +++ b/subversion/include/svn_version.h @@ -70,7 +70,7 @@ extern "C" { * * @since New in 1.1. */ -#define SVN_VER_PATCH 4 +#define SVN_VER_PATCH 5 /** @deprecated Provided for backward compatibility with the 1.0 API. */ @@ -93,7 +93,7 @@ extern "C" { * * Always change this at the same time as SVN_VER_NUMTAG. */ -#define SVN_VER_TAG " (r1740329)" +#define SVN_VER_TAG " (r1770682)" /** Number tag: a string describing the version. @@ -117,7 +117,7 @@ extern "C" { * file version. Its value remains 0 in the repository except in release * tags where it is the revision from which the tag was created. */ -#define SVN_VER_REVISION 1740329 +#define SVN_VER_REVISION 1770682 /* Version strings composed from the above definitions. */ |