Bug 1018884 - Fix char16_t/wchar_t mismatch in xulrunner/.
authorJacek Caban <jacek@codeweavers.com>
Tue, 03 Jun 2014 13:25:37 +0200
changeset 206644 d854774124a691c6ad1f0134386a913ef790cca7
parent 206643 781f4aff37694a9ff6c0bb6024bac798e765a5d2
child 206645 b47f2b59af11715113beaf5383c3a1b308d64a5f
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1018884
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1018884 - Fix char16_t/wchar_t mismatch in xulrunner/.
xulrunner/app/nsXULRunnerApp.cpp
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -44,17 +44,17 @@ using namespace mozilla;
  *        printf-style format string followed by arguments.
  */
 static void Output(bool isError, const char *fmt, ... )
 {
   va_list ap;
   va_start(ap, fmt);
 
 #if (defined(XP_WIN) && !MOZ_WINCONSOLE)
-  char16_t msg[2048];
+  wchar_t msg[2048];
   _vsnwprintf(msg, sizeof(msg)/sizeof(msg[0]), NS_ConvertUTF8toUTF16(fmt).get(), ap);
 
   UINT flags = MB_OK;
   if (isError)
     flags |= MB_ICONERROR;
   else
     flags |= MB_ICONINFORMATION;