summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorjim <jim@13f79535-47bb-0310-9956-ffa450edef68>2007-08-13 19:16:22 +0000
committerjim <jim@13f79535-47bb-0310-9956-ffa450edef68>2007-08-13 19:16:22 +0000
commite196b8feb7217fb283d669921e460c8ddd4a98ac (patch)
treeabed162254ea0c9c59738cd22fae5f35a3b4c595 /file_io
parent25fac909ba2d1c2134dfbd2f5a202728a09bcf44 (diff)
downloadlibapr-e196b8feb7217fb283d669921e460c8ddd4a98ac.tar.gz
In Mac OS X's VFS API file names are, by definition, canonically
decomposed Unicode, encoded using UTF-8. Shortest rep also uses composed UTF-8 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@565479 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/unix/filepath.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/file_io/unix/filepath.c b/file_io/unix/filepath.c
index 78797bd99..6a65b202e 100644
--- a/file_io/unix/filepath.c
+++ b/file_io/unix/filepath.c
@@ -305,6 +305,10 @@ APR_DECLARE(apr_status_t) apr_filepath_list_merge(char **liststr,
APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p)
{
+#if defined(DARWIN)
+ *style = APR_FILEPATH_ENCODING_UTF8;
+#else
*style = APR_FILEPATH_ENCODING_LOCALE;
+#endif
return APR_SUCCESS;
}