From 0298c31d7346d1140400fa6b61ef0b5e87ea1dab Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Wed, 28 Oct 2015 14:29:49 +0900 Subject: [PATCH] Bug 1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on xpcom. r=nfroyd --- xpcom/base/nsSystemInfo.cpp | 2 +- xpcom/components/ManifestParser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp index ff05ddf09fb0..74eb74244808 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp @@ -191,7 +191,7 @@ nsresult GetInstallYear(uint32_t& aYear) time_t raw_time = 0; DWORD time_size = sizeof(time_t); - status = RegQueryValueExW(hKey, NS_LITERAL_STRING("InstallDate").get(), + status = RegQueryValueExW(hKey, MOZ_UTF16("InstallDate"), nullptr, &type, (LPBYTE)&raw_time, &time_size); if (status != ERROR_SUCCESS) { diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 524d7127a414..08ca10ce4661 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -572,7 +572,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, #elif defined(MOZ_WIDGET_COCOA) SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); - nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), + nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), majorVersion, minorVersion); #elif defined(MOZ_WIDGET_GTK)