Bustage fix for bug 480745 on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 16 Aug 2012 19:28:16 -0400
changeset 102585 ef116cb88c2a51deff822b3cca73f3c4f41a2a6e
parent 102584 d38c7ec8c98f662882a49017c628ba522968b56b
child 102586 c068429832ead0e8e49544f842b8d0c50a7978fa
push id23297
push useremorley@mozilla.com
push dateFri, 17 Aug 2012 12:22:28 +0000
treeherdermozilla-central@e1cd9fb39dd7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs480745
milestone17.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
Bustage fix for bug 480745 on a CLOSED TREE.
security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1662,17 +1662,17 @@ nsNSSComponent::InitializeNSS(bool showW
   #if defined(XP_MACOSX)
     // On Mac CFM we place all NSS DBs in the Security
     // Folder in the profile directory.
     nsCOMPtr<nsIFile> cfmSecurityPath;
     cfmSecurityPath = profilePath; // alias for easier code reading
     cfmSecurityPath->AppendNative(NS_LITERAL_CSTRING("Security"));
   #endif
 
-  #ifdef defined(XP_MACOSX)
+  #if defined(XP_MACOSX)
     // On MachO, we need to access both directories,
     // and therefore need separate nsIFile instances.
     // Keep cfmSecurityPath instance, obtain new instance for MachO profilePath.
     rv = cfmSecurityPath->GetParent(getter_AddRefs(profilePath));
     if (NS_FAILED(rv)) {
       nsPSMInitPanic::SetPanic();
       return rv;
     }