summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2022-04-26 09:58:35 -0500
committerBrian Smith <brian@dbsoft.org>2022-04-26 10:19:04 -0500
commit7fe702603066e7f122d5dd66a3a1892ac7e06215 (patch)
tree4a939449d4d23c7dfcf19967bd2586504b362c16
parent93407295fc1e294855b7943cb00c00d2d4debc02 (diff)
downloaduxp-7fe702603066e7f122d5dd66a3a1892ac7e06215.tar.gz
Issue #1829 - Revert "Issue #1751 -- fix up a few stray #ifs"
This reverts commit e7e63565ee4635198cc51ec3dd6f7a41e554b930.
-rw-r--r--toolkit/mozapps/update/updater/updater.cpp2
-rw-r--r--toolkit/xre/nsXREDirProvider.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
index f31c16d45c..13d829243f 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -2197,7 +2197,7 @@ ProcessReplaceRequest()
// 2. Move newDir to destDir. In case of failure, revert step 1 and abort.
// 3. Delete tmpDir (or defer it to the next reboot).
-#ifdef XP_WIN
+#if XP_WIN
// Windows preserves the case of the file/directory names. We use the
// GetLongPathName API in order to get the correct case for the directory
// name, so that if the user has used a different case when launching the
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 7997b53b16..fdeee8d0f9 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1050,7 +1050,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult)
rv = appFile->GetParent(getter_AddRefs(updRoot));
NS_ENSURE_SUCCESS(rv, rv);
-#ifdef XP_WIN
+#if XP_WIN
nsAutoString pathHash;
bool pathHashResult = false;
bool hasVendor = gAppData->vendor && strlen(gAppData->vendor) != 0;