Author: svn-role
Date: Wed Apr 8 04:00:55 2020
New Revision: 1876267
URL: http://svn.apache.org/viewvc?rev=1876267&view=rev
Log:
Merge r1876068 from trunk:
* r1876068
Add libsvn_shelf.h and libsvn_shelf2.h to msvc-export, needed for the
private symbols
Justification:
Fix shelf-cmd/shelf2-cmd link errors for svn on Windows
Votes:
+1: jamessan, stsp, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/build.conf
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1876068
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876267&r1=1876266&r2=1876267&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:55 2020
@@ -20,11 +20,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1876068
- Add libsvn_shelf.h and libsvn_shelf2.h to msvc-export, needed for the
- private symbols
- Justification:
- Fix shelf-cmd/shelf2-cmd link errors for svn on Windows
- Votes:
- +1: jamessan, stsp, jcorvel
Modified: subversion/branches/1.14.x/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/build.conf?rev=1876267&r1=1876266&r2=1876267&view=diff
==============================================================================
--- subversion/branches/1.14.x/build.conf (original)
+++ subversion/branches/1.14.x/build.conf Wed Apr 8 04:00:55 2020
@@ -248,7 +248,7 @@ type = lib
path = subversion/libsvn_client
libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
install = lib
-msvc-export = svn_client.h private/svn_client_mtcc.h
private/svn_client_private.h
+msvc-export = svn_client.h private/svn_client_mtcc.h
private/svn_client_private.h private/svn_client_shelf.h
private/svn_client_shelf2.h
# Routines for binary diffing and tree-deltas
[libsvn_delta]
