From 7cd0f5a9f9c9b92bb89a4950ae7fb9195f794c1c Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Tue, 18 May 2004 04:10:43 +0000 Subject: [PATCH] Bug 242382 Trunk build failure in nsObjectFrame.cpp patch by roland.mainz@nrubsig.org r=roc sr=roc --- xpcom/string/public/nsAString.h | 8 +++++--- xpcom/string/public/nsSubstring.h | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xpcom/string/public/nsAString.h b/xpcom/string/public/nsAString.h index fc761fe84f1..6fcc0a0eb20 100644 --- a/xpcom/string/public/nsAString.h +++ b/xpcom/string/public/nsAString.h @@ -53,9 +53,11 @@ // If some platform(s) can't handle our template that matches literal strings, // then we'll disable it on those platforms. -#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && (defined(_MSC_VER) && _MSC_VER < 1310) -#define NS_DISABLE_LITERAL_TEMPLATE -#endif +#ifndef NS_DISABLE_LITERAL_TEMPLATE +# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) +# define NS_DISABLE_LITERAL_TEMPLATE +# endif +#endif /* !NS_DISABLE_LITERAL_TEMPLATE */ #include diff --git a/xpcom/string/public/nsSubstring.h b/xpcom/string/public/nsSubstring.h index 937d0cac02e..f0842cf571d 100644 --- a/xpcom/string/public/nsSubstring.h +++ b/xpcom/string/public/nsSubstring.h @@ -47,9 +47,11 @@ // If some platform(s) can't handle our template that matches literal strings, // then we'll disable it on those platforms. -#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && (defined(_MSC_VER) && _MSC_VER < 1310) -#define NS_DISABLE_LITERAL_TEMPLATE -#endif +#ifndef NS_DISABLE_LITERAL_TEMPLATE +# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560)) +# define NS_DISABLE_LITERAL_TEMPLATE +# endif +#endif /* !NS_DISABLE_LITERAL_TEMPLATE */ #include