From b0410fc20c45227756a7bbdcff65e29eb0bc4d91 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 20:34:59 +0200 Subject: Merging upstream version 115.10.0esr. Signed-off-by: Daniel Baumann --- xpcom/io/nsLocalFileCommon.cpp | 3 ++- xpcom/io/nsLocalFileCommon.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xpcom') 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 -- cgit v1.2.3