Author: brane
Date: Wed Jun 11 15:40:43 2025
New Revision: 1926360
URL: http://svn.apache.org/viewvc?rev=1926360&view=rev
Log:
Revert most of the changes in svn_utf.h from r1926293. Instead, tell the
CMake build to expose APR and APR-Util include paths everywhere.
* subversion/include/svn_utf.h:
Return the original comment to the apr_xlate include directive.
(SVN_APR_DEFAULT_CHARSET, SVN_APR_LOCALE_CHARSET): Revert to previous values.
* CMakeLists.txt: Add APR and APR-Util include paths to the top-level
directory properties.
Modified:
subversion/trunk/CMakeLists.txt
subversion/trunk/subversion/include/svn_utf.h
Modified: subversion/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1926360&r1=1926359&r2=1926360&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Wed Jun 11 15:40:43 2025
@@ -289,6 +289,12 @@ else()
endif()
endif()
+# APR and APR-Util include directories must be available to all our souroces,
+# not just those that happen to link with one or the other of these libraries.
+get_target_property(_apr_include external-apr INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(_apu_include external-aprutil
INTERFACE_INCLUDE_DIRECTORIES)
+include_directories(${_apr_include} ${_apu_include})
+
### ZLIB
if(SVN_USE_PKG_CONFIG)
Modified: subversion/trunk/subversion/include/svn_utf.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_utf.h?rev=1926360&r1=1926359&r2=1926360&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_utf.h (original)
+++ subversion/trunk/subversion/include/svn_utf.h Wed Jun 11 15:40:43 2025
@@ -33,7 +33,7 @@
#define SVN_UTF_H
#include <apr_pools.h>
-#include <apr_xlate.h> /* backward compat */
+#include <apr_xlate.h> /* for APR_*_CHARSET */
#include "svn_types.h"
#include "svn_string.h"
@@ -47,12 +47,12 @@ extern "C" {
* useful if there are literal strings in the source code which must
* be translated according to the charset of the source code.
*/
-#define SVN_APR_DEFAULT_CHARSET (const char *)0
+#define SVN_APR_DEFAULT_CHARSET APR_DEFAULT_CHARSET
/**
* To indicate charset names of the current locale
*/
-#define SVN_APR_LOCALE_CHARSET (const char *)1
+#define SVN_APR_LOCALE_CHARSET APR_LOCALE_CHARSET
/**
* Initialize the UTF-8 encoding/decoding routines.
