From 45876f065f79d9ed6bf5ee7aadab22b81b841c7e Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Sep 2012 10:24:09 -0400
Subject: [PATCH] backout 5f9951a2e6df (bug 785918) for breaking on osx

---
 .../manager/boot/src/nsStrictTransportSecurityService.cpp   | 2 +-
 toolkit/identity/IdentityCryptoService.cpp                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/manager/boot/src/nsStrictTransportSecurityService.cpp b/security/manager/boot/src/nsStrictTransportSecurityService.cpp
index 8a1b9b116567..9bbf1e42188a 100644
--- a/security/manager/boot/src/nsStrictTransportSecurityService.cpp
+++ b/security/manager/boot/src/nsStrictTransportSecurityService.cpp
@@ -352,7 +352,7 @@ nsStrictTransportSecurityService::GetPreloadListEntry(const char *aHost)
 {
   return (const nsSTSPreload *) bsearch(aHost,
                                         kSTSPreloadList,
-                                        mozilla::ArrayLength(kSTSPreloadList),
+                                        PR_ARRAY_SIZE(kSTSPreloadList),
                                         sizeof(nsSTSPreload),
                                         STSPreloadCompare);
 }
diff --git a/toolkit/identity/IdentityCryptoService.cpp b/toolkit/identity/IdentityCryptoService.cpp
index 61f9d4a182ae..707636ced19d 100644
--- a/toolkit/identity/IdentityCryptoService.cpp
+++ b/toolkit/identity/IdentityCryptoService.cpp
@@ -457,9 +457,9 @@ GenerateDSAKeyPair(PK11SlotInfo * slot,
 
   PQGParams pqgParams  = {
     NULL /*arena*/,
-    { siBuffer, P, mozilla::ArrayLength(P) },
-    { siBuffer, Q, mozilla::ArrayLength(Q) },
-    { siBuffer, G, mozilla::ArrayLength(G) }
+    { siBuffer, P, PR_ARRAY_SIZE(P) },
+    { siBuffer, Q, PR_ARRAY_SIZE(Q) },
+    { siBuffer, G, PR_ARRAY_SIZE(G) }
   };
 
   return GenerateKeyPair(slot, privateKey, publicKey, CKM_DSA_KEY_PAIR_GEN,