diff --git a/string/public/nsLiteralString.h b/string/public/nsLiteralString.h index b5d30e01baa2..83eb98926591 100644 --- a/string/public/nsLiteralString.h +++ b/string/public/nsLiteralString.h @@ -67,8 +67,8 @@ literal_string( const char* aPtr, PRUint32 aLength ) #ifdef HAVE_CPP_2BYTE_WCHAR_T #define NS_L(s) L##s - #define NS_MULTILINE_LITERAL_STRING(s) nsLiteralString(s, (sizeof(s)/sizeof(wchar_t))-1) - #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) nsLiteralString n(s, (sizeof(s)/sizeof(wchar_t))-1) + #define NS_MULTILINE_LITERAL_STRING(s) nsLocalString(s, (sizeof(s)/sizeof(wchar_t))-1) + #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) nsLocalString n(s, (sizeof(s)/sizeof(wchar_t))-1) #else #define NS_L(s) s #define NS_MULTILINE_LITERAL_STRING(s) NS_ConvertASCIItoUCS2(s, sizeof(s)-1) @@ -78,7 +78,7 @@ literal_string( const char* aPtr, PRUint32 aLength ) #define NS_LITERAL_STRING(s) NS_MULTILINE_LITERAL_STRING(NS_L(s)) #define NS_NAMED_LITERAL_STRING(n,s) NS_NAMED_MULTILINE_LITERAL_STRING(n,NS_L(s)) -#define NS_LITERAL_CSTRING(s) nsLiteralCString(s, sizeof(s)-1) -#define NS_NAMED_LITERAL_CSTRING(n,s) nsLiteralCString n(s, sizeof(s)-1) +#define NS_LITERAL_CSTRING(s) nsLocalCString(s, sizeof(s)-1) +#define NS_NAMED_LITERAL_CSTRING(n,s) nsLocalCString n(s, sizeof(s)-1) #endif /* !defined(nsLiteralString_h___) */ diff --git a/xpcom/string/public/nsLiteralString.h b/xpcom/string/public/nsLiteralString.h index b5d30e01baa2..83eb98926591 100644 --- a/xpcom/string/public/nsLiteralString.h +++ b/xpcom/string/public/nsLiteralString.h @@ -67,8 +67,8 @@ literal_string( const char* aPtr, PRUint32 aLength ) #ifdef HAVE_CPP_2BYTE_WCHAR_T #define NS_L(s) L##s - #define NS_MULTILINE_LITERAL_STRING(s) nsLiteralString(s, (sizeof(s)/sizeof(wchar_t))-1) - #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) nsLiteralString n(s, (sizeof(s)/sizeof(wchar_t))-1) + #define NS_MULTILINE_LITERAL_STRING(s) nsLocalString(s, (sizeof(s)/sizeof(wchar_t))-1) + #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) nsLocalString n(s, (sizeof(s)/sizeof(wchar_t))-1) #else #define NS_L(s) s #define NS_MULTILINE_LITERAL_STRING(s) NS_ConvertASCIItoUCS2(s, sizeof(s)-1) @@ -78,7 +78,7 @@ literal_string( const char* aPtr, PRUint32 aLength ) #define NS_LITERAL_STRING(s) NS_MULTILINE_LITERAL_STRING(NS_L(s)) #define NS_NAMED_LITERAL_STRING(n,s) NS_NAMED_MULTILINE_LITERAL_STRING(n,NS_L(s)) -#define NS_LITERAL_CSTRING(s) nsLiteralCString(s, sizeof(s)-1) -#define NS_NAMED_LITERAL_CSTRING(n,s) nsLiteralCString n(s, sizeof(s)-1) +#define NS_LITERAL_CSTRING(s) nsLocalCString(s, sizeof(s)-1) +#define NS_NAMED_LITERAL_CSTRING(n,s) nsLocalCString n(s, sizeof(s)-1) #endif /* !defined(nsLiteralString_h___) */