You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2016/04/18 10:55:23 UTC
svn commit: r1739707 - in /subversion/trunk/subversion:
include/private/ra_svn_sasl.h include/private/ra_svn_wrapped_sasl.h
include/private/svn_wrapped_sasl.h libsvn_ra_svn/wrapped_sasl.c
libsvn_subr/wrapped_sasl.c
Author: brane
Date: Mon Apr 18 08:55:23 2016
New Revision: 1739707
URL: http://svn.apache.org/viewvc?rev=1739707&view=rev
Log:
Move the wrapped SASL API implementation to libsvn_ra_svn, where it belongs.
* subversion/include/private/ra_svn_wrapped_sasl.h:
Renamed from svn_wrapped_sasl.h; all uses updated (see below).
Include stddef.h for size_t which is needed by sasl.h on some platforms.
* subversion/include/private/ra_svn_sasl.h: Rename included header.
* subversion/libsvn_ra_svn/wrapped_sasl.c:
Moved here from subversion/libsvn_subr. Rename included header.
Added:
subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h
- copied, changed from r1739706, subversion/trunk/subversion/include/private/svn_wrapped_sasl.h
subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c
- copied, changed from r1739706, subversion/trunk/subversion/libsvn_subr/wrapped_sasl.c
Removed:
subversion/trunk/subversion/include/private/svn_wrapped_sasl.h
subversion/trunk/subversion/libsvn_subr/wrapped_sasl.c
Modified:
subversion/trunk/subversion/include/private/ra_svn_sasl.h
Modified: subversion/trunk/subversion/include/private/ra_svn_sasl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/ra_svn_sasl.h?rev=1739707&r1=1739706&r2=1739707&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/ra_svn_sasl.h (original)
+++ subversion/trunk/subversion/include/private/ra_svn_sasl.h Mon Apr 18 08:55:23 2016
@@ -28,7 +28,7 @@
#define RA_SVN_SASL_H
/* Keep this include statement at the top of theis file. */
-#include "private/svn_wrapped_sasl.h"
+#include "private/ra_svn_wrapped_sasl.h"
#include <apr_errno.h>
#include <apr_pools.h>
Copied: subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h (from r1739706, subversion/trunk/subversion/include/private/svn_wrapped_sasl.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h?p2=subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h&p1=subversion/trunk/subversion/include/private/svn_wrapped_sasl.h&r1=1739706&r2=1739707&rev=1739707&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wrapped_sasl.h (original)
+++ subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h Mon Apr 18 08:55:23 2016
@@ -21,8 +21,10 @@
* ====================================================================
*/
-#ifndef SVN_WRAPPED_SASL_H
-#define SVN_WRAPPED_SASL_H
+#ifndef RA_SVN_WRAPPED_SASL_H
+#define RA_SVN_WRAPPED_SASL_H
+
+#include <stddef.h>
#ifdef WIN32
# define APR_WANT_IOVEC
@@ -126,4 +128,4 @@ svn_sasl__decode(sasl_conn_t *, const ch
# endif
#endif /* __APPLE__ */
-#endif /* SVN_WRAPPED_SASL_H */
+#endif /* RA_SVN_WRAPPED_SASL_H */
Copied: subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c (from r1739706, subversion/trunk/subversion/libsvn_subr/wrapped_sasl.c)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c?p2=subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c&p1=subversion/trunk/subversion/libsvn_subr/wrapped_sasl.c&r1=1739706&r2=1739707&rev=1739707&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/wrapped_sasl.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c Mon Apr 18 08:55:23 2016
@@ -24,7 +24,7 @@
#include "svn_private_config.h"
#ifdef SVN_HAVE_SASL
-#include "private/svn_wrapped_sasl.h"
+#include "private/ra_svn_wrapped_sasl.h"
/* See the comment at the top of svn_wrapped_sasl.h */
#ifdef __APPLE__