You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/12/09 14:26:53 UTC
svn commit: r1718853 - in /subversion/branches/ra-git/subversion:
libsvn_fs_git/git-lib.c libsvn_fs_git/svn_git.h libsvn_ra_git/fetch.c
Author: rhuijben
Date: Wed Dec 9 13:26:53 2015
New Revision: 1718853
URL: http://svn.apache.org/viewvc?rev=1718853&view=rev
Log:
On the ra-git branch: Remove now unneeded #define.
libgit2 stopped defining inline functions for compatibility reasons,
so we can remove this hack.
* subversion/libsvn_fs_git/git-lib.c
(includes): Use include via svn_git.h
* subversion/libsvn_fs_git/svn_git.h
(inline): Remove #define.
* subversion/libsvn_ra_git/fetch.c
(inline): Remove #define.
Modified:
subversion/branches/ra-git/subversion/libsvn_fs_git/git-lib.c
subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.h
subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c
Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/git-lib.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/git-lib.c?rev=1718853&r1=1718852&r2=1718853&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/git-lib.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/git-lib.c Wed Dec 9 13:26:53 2015
@@ -28,8 +28,6 @@
#include <apr_pools.h>
#include <apr_file_io.h>
-#include <git2.h>
-
#include "svn_fs.h"
#include "svn_delta.h"
#include "svn_version.h"
Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.h
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.h?rev=1718853&r1=1718852&r2=1718853&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.h (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.h Wed Dec 9 13:26:53 2015
@@ -20,10 +20,7 @@
* ====================================================================
*/
-/* We compile in C89 mode, so the 'inline' keyword used by libgit2 isn't supported. */
-#define inline APR_INLINE
#include <git2.h>
-#undef inline
#include "svn_types.h"
Modified: subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c?rev=1718853&r1=1718852&r2=1718853&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c Wed Dec 9 13:26:53 2015
@@ -22,10 +22,9 @@
* ====================================================================
*/
- /* We compile in C89 mode, so the 'inline' keyword used by libgit2 isn't supported. */
-#define inline APR_INLINE
+#include <apr.h>
+
#include <git2.h>
-#undef inline
#include "svn_hash.h"
#include "svn_ra.h"