diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-05-09 22:38:16 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-05-09 22:38:16 +0000 |
| commit | 9edf1b7bea5ff893f88911fc1a6a2dca3faeece9 (patch) | |
| tree | 98bd9b0c7e3ca3e517e9e43dea157707b13f6bdb /xpcom/build/XPCOMInit.cpp | |
| parent | 930ddd693be251c86ee904dafbaef38234b692c0 (diff) | |
| download | uxp-9edf1b7bea5ff893f88911fc1a6a2dca3faeece9.tar.gz | |
Issue #1896 - Port GetNativePath changes from GRE.getnativepath-work
Diffstat (limited to 'xpcom/build/XPCOMInit.cpp')
| -rw-r--r-- | xpcom/build/XPCOMInit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 185a823155..835f250da1 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -688,9 +688,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, getter_AddRefs(greDir)); MOZ_ASSERT(greDir); nsAutoCString nativeGREPath; +#ifdef XP_WIN + greDir->GetPersistentDescriptor(nativeGREPath); +#else greDir->GetNativePath(nativeGREPath); - u_setDataDirectory(nativeGREPath.get()); #endif + u_setDataDirectory(nativeGREPath.get()); +#endif // MOZ_ICU_DATA_ARCHIVE // Initialize the JS engine. const char* jsInitFailureReason = JS_InitWithFailureDiagnostic(); |