Bug 1218315 - Use L"..." instead of MOZ_UTF16(...) for MSVS2015. r=nfroyd
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 28 Oct 2015 22:36:40 +0900
changeset 270000 c537a7eb9bbd38b3b5a69b0567523afc3631208c
parent 269999 53952bbfad9afaf6fb5bab4d739dd26cbac67da1
child 270001 692dbb16a94976c90cd7700604bb02be54f3d20b
push id29596
push userkwierso@gmail.com
push dateThu, 29 Oct 2015 00:00:32 +0000
treeherdermozilla-central@1e700005a0dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnfroyd
bugs1218315
milestone44.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 1218315 - Use L"..." instead of MOZ_UTF16(...) for MSVS2015. r=nfroyd
xpcom/base/nsSystemInfo.cpp
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -186,17 +186,17 @@ nsresult GetInstallYear(uint32_t& aYear)
   }
 
   nsAutoRegKey key(hKey);
 
   DWORD type = 0;
   time_t raw_time = 0;
   DWORD time_size = sizeof(time_t);
 
-  status = RegQueryValueExW(hKey, MOZ_UTF16("InstallDate"),
+  status = RegQueryValueExW(hKey, L"InstallDate",
                             nullptr, &type, (LPBYTE)&raw_time, &time_size);
 
   if (status != ERROR_SUCCESS) {
     return NS_ERROR_UNEXPECTED;
   }
 
   if (type != REG_DWORD) {
     return NS_ERROR_UNEXPECTED;