nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1843207 - Stop using nsCocoaUtils::ToNSString in OSReauthenticatorDarwin.mm. r=nika

Browse source 
and enable it on iOS.

Differential Revision: https://phabricator.services.mozilla.com/D204320
This commit is contained in:
Mike Hommey 2024-03-13 20:54:20 +00:00
parent f340943d94
commit 752c080608
3 changed files with 7 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
security/manager/ssl/OSReauthenticatorDarwin.mm
View file

@ -6,7 +6,7 @@
#include "OSReauthenticator.h" #include "OSReauthenticator.h"
#include "nsCocoaUtils.h" #include "mozilla/MacStringHelpers.h"
using namespace mozilla; using namespace mozilla;
@ -23,7 +23,7 @@ nsresult ReauthenticateUserMacOS(const nsAString& aPrompt,
// password. If they correctly enter it, we'll set aReauthenticated to true. // password. If they correctly enter it, we'll set aReauthenticated to true.
LAContext* context = [[LAContext alloc] init]; LAContext* context = [[LAContext alloc] init];
NSString* prompt = nsCocoaUtils::ToNSString(aPrompt); NSString* prompt = mozilla::XPCOMStringToNSString(aPrompt);
dispatch_semaphore_t sema = dispatch_semaphore_create(0); dispatch_semaphore_t sema = dispatch_semaphore_create(0);

2
security/manager/ssl/moz.build
View file

@ -169,7 +169,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CFLAGS += CONFIG["GLIB_CFLAGS"] CFLAGS += CONFIG["GLIB_CFLAGS"]
CXXFLAGS += CONFIG["GLIB_CFLAGS"] CXXFLAGS += CONFIG["GLIB_CFLAGS"]
if CONFIG["TARGET_OS"] == "OSX": if CONFIG["TARGET_KERNEL"] == "Darwin":
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
"KeychainSecret.cpp", "KeychainSecret.cpp",
"OSReauthenticatorDarwin.mm", "OSReauthenticatorDarwin.mm",

6
xpcom/base/moz.build
View file

@ -29,19 +29,21 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
] ]
EXPORTS.mozilla += [ EXPORTS.mozilla += [
"MacHelpers.h", "MacHelpers.h",
"MacStringHelpers.h",
"nsMacPreferencesReader.h", "nsMacPreferencesReader.h",
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
"MacHelpers.mm", "MacHelpers.mm",
"MacStringHelpers.mm",
"nsMacPreferencesReader.mm", "nsMacPreferencesReader.mm",
] ]
if CONFIG["OS_ARCH"] == "Darwin": if CONFIG["OS_ARCH"] == "Darwin":
EXPORTS += [ EXPORTS += [
"nsObjCExceptions.h", "nsObjCExceptions.h",
] ]
EXPORTS.mozilla += [
"MacStringHelpers.h",
]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
"MacStringHelpers.mm",
"nsObjCExceptions.mm", "nsObjCExceptions.mm",
] ]