Bug 944905 - Fix char16_t/wchar_t mismatch in xpcom/ r=bsmedberg

2014-01-07 14:54:52 +01:00
parent dc2e47a5a9
commit 264744c22f
6 changed files with 32 additions and 10 deletions
--- a/xpcom/glue/nsTextFormatter.cpp
+++ b/xpcom/glue/nsTextFormatter.cpp
@@ -513,9 +513,7 @@ static int cvt_S(SprintfState *ss, const char16_t *s, int width,
    }

    /* and away we go */
-    NS_NAMED_LITERAL_STRING(nullstr, "(null)");
-
-    return fill2(ss, s ? s : nullstr.get(), slen, width, flags);
+    return fill2(ss, s ? s : MOZ_UTF16("(null)"), slen, width, flags);
 }

 /*