]> granicus.if.org Git - icu/commitdiff
ICU-20491 ICU4C u_getDataDirectory on Windows shouldn't set path to current directory...
authorJeff Genovy <29107334+jefgen@users.noreply.github.com>
Wed, 13 Mar 2019 03:04:40 +0000 (20:04 -0700)
committerJeff Genovy <29107334+jefgen@users.noreply.github.com>
Wed, 13 Mar 2019 20:25:33 +0000 (13:25 -0700)
This change was introduced by the following commit e9946ec98eb14f485a85f690fb41029d492b03a2.

However, there's really no reason why the Windows UWP version should require the icudtl.dat file
to be in the same directory as the icuuc.dll file.

icu4c/source/common/putil.cpp

index 42db744c774d74718106a7accb9c76708ec97cc0..6e5468fe0bd45cdcf108c708eb51e04b051a0014 100644 (file)
@@ -1420,12 +1420,7 @@ static void U_CALLCONV dataDirectoryInitFn() {
 
     if(path==NULL) {
         /* It looks really bad, set it to something. */
-#if U_PLATFORM_HAS_WIN32_API
-        // Windows UWP will require icudtl.dat file in same directory as icuuc.dll
-        path = ".\\";
-#else
         path = "";
-#endif
     }
 
     u_setDataDirectory(path);