summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
authorMladen Turk <mturk@apache.org>2021-12-02 22:09:53 +0000
committerMladen Turk <mturk@apache.org>2021-12-02 22:09:53 +0000
commitfd59a4a0747cf5895c21481acb67f1519b11802a (patch)
tree52e43979463cd86b92971dff2bea3a358168abcf /file_io
parent62285e4db364a86e99699b0a1d13a2f2f3bae49f (diff)
downloadapr-fd59a4a0747cf5895c21481acb67f1519b11802a.tar.gz
Stage 3 in cleaning win95 code ... cleanup headers
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r--file_io/win32/filepath.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c
index 23870bc54..56e69a153 100644
--- a/file_io/win32/filepath.c
+++ b/file_io/win32/filepath.c
@@ -977,14 +977,6 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p)
{
-#if APR_HAS_UNICODE_FS
- IF_WIN_OS_IS_UNICODE
- {
- *style = APR_FILEPATH_ENCODING_UTF8;
- return APR_SUCCESS;
- }
-#endif
-
- *style = APR_FILEPATH_ENCODING_LOCALE;
- return APR_SUCCESS;
+ *style = APR_FILEPATH_ENCODING_UTF8;
+ return APR_SUCCESS;
}