Author: cmpilato
Date: Thu May 12 17:30:02 2011
New Revision: 1102393
URL: http://svn.apache.org/viewvc?rev=1102393&view=rev
Log:
* subversion/includes/svn_subst.h
(svn_subst_translate_string): Move to below svn_subst_translate_string2().
Modified:
subversion/trunk/subversion/include/svn_subst.h
Modified: subversion/trunk/subversion/include/svn_subst.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_subst.h?rev=1102393&r1=1102392&r2=1102393&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_subst.h (original)
+++ subversion/trunk/subversion/include/svn_subst.h Thu May 12 17:30:02 2011
@@ -602,17 +602,6 @@ svn_subst_stream_detranslated(svn_stream
/* EOL conversion and character encodings */
-/** Similar to svn_subst_translate_string2(), except that the information about
- * whether re-encoding or line ending translation were performed is discarded.
- *
- * @deprecated Provided for backward compatibility with the 1.6 API.
- */
-SVN_DEPRECATED
-svn_error_t *svn_subst_translate_string(svn_string_t **new_value,
- const svn_string_t *value,
- const char *encoding,
- apr_pool_t *pool);
-
/** Translate the string @a value from character encoding @a encoding to
* UTF8, and also from its current line-ending style to LF line-endings. If
* @a encoding is @c NULL, translate from the system-default encoding.
@@ -646,6 +635,17 @@ svn_subst_translate_string2(svn_string_t
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/** Similar to svn_subst_translate_string2(), except that the information about
+ * whether re-encoding or line ending translation were performed is discarded.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
+SVN_DEPRECATED
+svn_error_t *svn_subst_translate_string(svn_string_t **new_value,
+ const svn_string_t *value,
+ const char *encoding,
+ apr_pool_t *pool);
+
/** Translate the string @a value from UTF8 and LF line-endings into native
* character encoding and native line-endings. If @a for_output is TRUE,
* translate to the character encoding of the output locale, else to that of
