diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 18:35:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 18:35:44 +0000 |
| commit | c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2 (patch) | |
| tree | 74359a4b4954f9380cb0fb23b59f0c53d9355f5d /xpcom | |
| parent | Releasing progress-linux version 115.9.1esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2.tar.xz firefox-esr-c0db95d3dda1865d4c6bf0666b0e7439b40b9bf2.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.cpp | 3 | ||||
| -rw-r--r-- | xpcom/io/nsLocalFileCommon.h | 4 |
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 |