You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2011/01/02 20:20:48 UTC
svn commit: r1054462 - in /subversion/branches/diff-optimizations-bytes: ./
build.conf subversion/include/private/svn_adler32.h
subversion/libsvn_subr/adler32.c
Author: jcorvel
Date: Sun Jan 2 19:20:48 2011
New Revision: 1054462
URL: http://svn.apache.org/viewvc?rev=1054462&view=rev
Log:
On the diff-optimizations-bytes branch:
Bring up to date with trunk again, to get the build.conf fix of r1054421.
Modified:
subversion/branches/diff-optimizations-bytes/ (props changed)
subversion/branches/diff-optimizations-bytes/build.conf
subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h (contents, props changed)
subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c (props changed)
Propchange: subversion/branches/diff-optimizations-bytes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 2 19:20:48 2011
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:1031270-1054360
+/subversion/trunk:1031270-1054461
Modified: subversion/branches/diff-optimizations-bytes/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/build.conf?rev=1054462&r1=1054461&r2=1054462&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/build.conf (original)
+++ subversion/branches/diff-optimizations-bytes/build.conf Sun Jan 2 19:20:48 2011
@@ -329,7 +329,7 @@ msvc-export =
private\svn_log.h private\svn_mergeinfo_private.h
private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
private\svn_utf_private.h private\svn_eol_private.h
- private\svn_token.h
+ private\svn_token.h private\svn_adler32.h
# Working copy management lib
[libsvn_wc]
Modified: subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h?rev=1054462&r1=1054461&r2=1054462&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h Sun Jan 2 19:20:48 2011
@@ -29,6 +29,11 @@
#include <apr.h>
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
/**
* Return an adler32 checksum based on CHECKSUM, updated with
* DATA of size LEN.
@@ -39,4 +44,9 @@ apr_uint32_t
svn__adler32(apr_uint32_t checksum, const char *data, apr_off_t len);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
#endif /* SVN_ADLER32_H */
Propchange: subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 2 19:20:48 2011
@@ -40,3 +40,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
+/subversion/trunk/subversion/include/private/svn_adler32.h:1054278-1054461
Propchange: subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 2 19:20:48 2011
@@ -0,0 +1 @@
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1054278-1054461