Revert broken [17908:17910]

[vlc] / src / misc / unicode.c

diff --git a/src/misc/unicode.c b/src/misc/unicode.c
index e95998e12bc0bba19e45826105efe2d366eee4fa..76f2f1d8a35f60a0db6efc274e533dfbf20678de 100644 (file)
--- a/src/misc/unicode.c
+++ b/src/misc/unicode.c
@@ -429,11 +429,7 @@ int utf8_mkdir( const char *dirname )
 
 void *utf8_opendir( const char *dirname )
 {
-
-#if defined (UNDER_CE) || defined (WIN32)
-    DIR *dir = vlc_opendir_wrapper( dirname );
-    return dir;
-#else
+    /* TODO: support for WinNT non-ACP filenames */
     const char *local_name = ToLocale( dirname );
 
     if( local_name != NULL )
@@ -444,8 +440,6 @@ void *utf8_opendir( const char *dirname )
     }
     else
         errno = ENOENT;
-#endif
-
     return NULL;
 }
 
@@ -458,11 +452,7 @@ char *utf8_readdir( void *dir )
     if( ent == NULL )
         return NULL;
 
-#if defined (UNDER_CE) || defined (WIN32)
-    return FromWide(ent->d_name);
-#else
     return vlc_fix_readdir( ent->d_name );
-#endif
 }
 
 static int dummy_select( const char *str )