summaryrefslogtreecommitdiffstats
path: root/xpcom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-21 18:34:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-21 18:34:59 +0000
commitb0410fc20c45227756a7bbdcff65e29eb0bc4d91 (patch)
tree36bdaeed45bddfc236ac77adf672339174b3c9b3 /xpcom
parentAdding debian version 115.9.1esr-1~deb12u1. (diff)
downloadfirefox-esr-b0410fc20c45227756a7bbdcff65e29eb0bc4d91.tar.xz
firefox-esr-b0410fc20c45227756a7bbdcff65e29eb0bc4d91.zip
Merging upstream version 115.10.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xpcom')
-rw-r--r--xpcom/io/nsLocalFileCommon.cpp3
-rw-r--r--xpcom/io/nsLocalFileCommon.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/xpcom/io/nsLocalFileCommon.cpp b/xpcom/io/nsLocalFileCommon.cpp
index f6eabf2d0f..7e9d7151c1 100644
--- a/xpcom/io/nsLocalFileCommon.cpp
+++ b/xpcom/io/nsLocalFileCommon.cpp
@@ -139,7 +139,8 @@ const char* const sExecutableExts[] = {
".wsc",
".wsf",
".wsh",
- ".xll" // MS Excel dynamic link library
+ ".xll", // MS Excel dynamic link library
+ ".xrm-ms"
// clang-format on
};
diff --git a/xpcom/io/nsLocalFileCommon.h b/xpcom/io/nsLocalFileCommon.h
index 3db0ac9e89..96b7e1f06a 100644
--- a/xpcom/io/nsLocalFileCommon.h
+++ b/xpcom/io/nsLocalFileCommon.h
@@ -8,9 +8,9 @@
#define _NS_LOCAL_FILE_COMMON_H_
#ifdef MOZ_ESR
-extern const char* const sExecutableExts[107];
-#else
extern const char* const sExecutableExts[108];
+#else
+extern const char* const sExecutableExts[109];
#endif
#endif