diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
| commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
| tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /dom/plugins/ipc | |
| parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
| parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
| download | UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.gz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.lz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.tar.xz UXP-9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f.zip | |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'dom/plugins/ipc')
| -rw-r--r-- | dom/plugins/ipc/PluginModuleChild.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index f943dfc42..98c9cd494 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -40,8 +40,8 @@ #ifdef XP_WIN #include "nsWindowsDllInterceptor.h" #include "mozilla/widget/AudioSession.h" -#include "WinUtils.h" #include <knownfolders.h> +#include <shlobj.h> #endif #ifdef MOZ_WIDGET_COCOA @@ -1918,8 +1918,8 @@ GetLocalLowTempPath(size_t aLen, LPWSTR aPath) { NS_NAMED_LITERAL_STRING(tempname, "\\Temp"); LPWSTR path; - if (SUCCEEDED(WinUtils::SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0, - nullptr, &path))) { + if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0, + nullptr, &path))) { if (wcslen(path) + tempname.Length() < aLen) { wcscpy(aPath, path); wcscat(aPath, tempname.get()); |