diff --git a/mozilla/xpcom/string/public/nsAString.h b/mozilla/xpcom/string/public/nsAString.h
index ccfb342477c..f409c628a67 100644
--- a/mozilla/xpcom/string/public/nsAString.h
+++ b/mozilla/xpcom/string/public/nsAString.h
@@ -53,7 +53,9 @@
 
 // If some platform(s) can't handle our template that matches literal strings,
 // then we'll disable it on those platforms.
-// #define NS_DISABLE_LITERAL_TEMPLATE
+#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && defined(_MSC_VER)
+#define NS_DISABLE_LITERAL_TEMPLATE
+#endif
 
 #include <string.h>
 
diff --git a/mozilla/xpcom/string/public/nsSubstring.h b/mozilla/xpcom/string/public/nsSubstring.h
index 0802f77aef5..73249321885 100644
--- a/mozilla/xpcom/string/public/nsSubstring.h
+++ b/mozilla/xpcom/string/public/nsSubstring.h
@@ -47,7 +47,9 @@
 
 // If some platform(s) can't handle our template that matches literal strings,
 // then we'll disable it on those platforms.
-// #define NS_DISABLE_LITERAL_TEMPLATE
+#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && defined(_MSC_VER)
+#define NS_DISABLE_LITERAL_TEMPLATE
+#endif
 
 #include <string.h>