aboutsummaryrefslogtreecommitdiffstats
path: root/win32/win32.c
diff options
context:
space:
mode:
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/win32/win32.c b/win32/win32.c
index d68a295f91..3b827662a7 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2025,16 +2025,9 @@ readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, struct direct *, rb_enco
/* License: Ruby's */
struct direct *
-rb_w32_readdir(DIR *dirp)
+rb_w32_readdir(DIR *dirp, rb_encoding *enc)
{
- return readdir_internal(dirp, win32_direct_conv, NULL);
-}
-
-/* License: Ruby's */
-struct direct *
-rb_w32_readdir_with_enc(DIR *dirp, rb_encoding *enc)
-{
- if (enc == rb_ascii8bit_encoding())
+ if (!enc || enc == rb_ascii8bit_encoding())
return readdir_internal(dirp, win32_direct_conv, NULL);
else
return readdir_internal(dirp, ruby_direct_conv, enc);