On Fri, Feb 24, 2017 at 03:39:43AM +0100, Stefan wrote:
> On 2/21/2017 13:54, Stefan Sperling wrote:
> > The new 1.10.1-alpha2 release is up for signing.
> >
> > The proposed 1.10.0-alpha1 release had a compilation problem on Windows.
> > The alpha2 release should fix this problem. It is based on trunk@r1783880.
> >
> > Full committers, please get this release from
> > https://dist.apache.org/repos/dist/dev/subversion
> > and add your signatures there.
> >
> > Thank you!
> 
> Building the new svnconflict tool I'm getting the following linker errors:
> 
> error LNK2001: unresolved external symbol svn_diff_version
> error LNK2001: unresolved external symbol svn_delta_version
> 
> (that is: with Visual Studio 2015Up3).
> 
> Applying the attached patch resolves the build issue for me.

Thanks! Does this patch work for you?

Index: tools/client-side/svnconflict/svnconflict.c
===================================================================
--- tools/client-side/svnconflict/svnconflict.c (revision 1784254)
+++ tools/client-side/svnconflict/svnconflict.c (working copy)
@@ -244,8 +244,6 @@ check_lib_versions(void)
       { "svn_client", svn_client_version },
       { "svn_wc",     svn_wc_version },
       { "svn_ra",     svn_ra_version },
-      { "svn_delta",  svn_delta_version },
-      { "svn_diff",   svn_diff_version },
       { NULL, NULL }
     };
   SVN_VERSION_DEFINE(my_version);

Reply via email to