summaryrefslogtreecommitdiff
path: root/file_io/unix/fileacc.c
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-11-08 22:26:41 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2000-11-08 22:26:41 +0000
commitbe0c71139838c272f8b731e876c35ab48a96f9ac (patch)
treed880cacad2bb697e8d679c06a0b2804f128a1a0d /file_io/unix/fileacc.c
parent412bafe678c44129bc0d4897743f16f1854b9eef (diff)
downloadlibapr-be0c71139838c272f8b731e876c35ab48a96f9ac.tar.gz
Catch up on some Unicode stuff that I've discovered while yanking around
with canon names. Mostly cleanups and NT vs. 9x fixups, plus some more useful canon types I'm playing with. Hope to close this tommorow. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60651 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/unix/fileacc.c')
-rw-r--r--file_io/unix/fileacc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/file_io/unix/fileacc.c b/file_io/unix/fileacc.c
index 71d796a20..9a18584dc 100644
--- a/file_io/unix/fileacc.c
+++ b/file_io/unix/fileacc.c
@@ -68,9 +68,6 @@
#else
#include "fileio.h"
#endif
-#if APR_HAS_UNICODE_FS
-#include "i18n.h"
-#endif
/* A file to put ALL of the accessor functions for apr_file_t types. */
@@ -92,9 +89,9 @@ apr_status_t apr_get_filename(char **fname, apr_file_t *thefile)
return APR_ENAMETOOLONG;
}
else
-#else /* !APR_HAS_UNICODE_FS */
+#endif /* !APR_HAS_UNICODE_FS */
*fname = apr_pstrdup(thefile->cntxt, thefile->n.fname);
-#endif
+
#else /* !def Win32 */
*fname = apr_pstrdup(thefile->cntxt, thefile->fname);
#endif