Bug 579517 follow-up: Remove NSPR types that crept in

accessible/src/base/nsAccessibilityService.cpp

@@ -92,8 +92,8 @@ MustBeAccessible(nsIContent* aContent, DocAccessible* aDocument)
   if (aContent->GetPrimaryFrame()->IsFocusable())
     return true;
 
-  PRUint32 attrCount = aContent->GetAttrCount();
-  for (PRUint32 attrIdx = 0; attrIdx < attrCount; attrIdx++) {
+  uint32_t attrCount = aContent->GetAttrCount();
+  for (uint32_t attrIdx = 0; attrIdx < attrCount; attrIdx++) {
     const nsAttrName* attr = aContent->GetAttrNameAt(attrIdx);
     if (attr->NamespaceEquals(kNameSpaceID_None)) {
       nsIAtom* attrAtom = attr->Atom();

js/src/vm/ForkJoin.cpp

@@ -139,7 +139,7 @@ class js::AutoRendezvous
     }
 };
 
-PRUintn ForkJoinSlice::ThreadPrivateIndex;
+unsigned ForkJoinSlice::ThreadPrivateIndex;
 
 class js::AutoSetForkJoinSlice
 {

js/src/vm/ForkJoin.h

@@ -155,7 +155,7 @@ struct ForkJoinSlice
 
 #ifdef JS_THREADSAFE
     // Initialized by Initialize()
-    static PRUintn ThreadPrivateIndex;
+    static unsigned ThreadPrivateIndex;
 #endif
 
     ForkJoinShared *const shared;

layout/mathml/nsMathMLContainerFrame.cpp

@@ -1522,7 +1522,7 @@ nsMathMLContainerFrame::TransmitAutomaticDataForMrowLikeElement()
 nsresult
 nsMathMLContainerFrame::ReportErrorToConsole(const char*       errorMsgId,
                                              const PRUnichar** aParams,
-                                             PRUint32          aParamCount)
+                                             uint32_t          aParamCount)
 {
   return nsContentUtils::ReportToConsole(nsIScriptError::errorFlag,
                                          "MathML", mContent->OwnerDoc(),

layout/mathml/nsMathMLContainerFrame.h

@@ -267,7 +267,7 @@ public:
   nsresult
   ReportErrorToConsole(const char*       aErrorMsgId,
                        const PRUnichar** aParams = nullptr,
-                       PRUint32          aParamCount = 0);
+                       uint32_t          aParamCount = 0);
 
   // helper method to reflow a child frame. We are inline frames, and we don't
   // know our positions until reflow is finished. That's why we ask the

media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c

@@ -153,7 +153,7 @@ sip_platform_task_init (void)
  * @return            The length of the written output not including the NULL
  *                    terminator, or -1 if an error occurs.
  */
-static PRUint32 sip_get_sock_dir_tmpl(char *out, PRUint32 outlen,
+static uint32_t sip_get_sock_dir_tmpl(char *out, uint32_t outlen,
                                       const char *suffix) {
 
     char *tmpdir;

security/manager/ssl/src/SharedSSLState.cpp

@@ -25,8 +25,8 @@ using mozilla::unused;
 
 namespace {
 
-static PRInt32 sCertOverrideSvcExists = 0;
-static PRInt32 sCertDBExists = 0;
+static int32_t sCertOverrideSvcExists = 0;
+static int32_t sCertDBExists = 0;
 
 class MainThreadClearer : public SyncRunnableBase
 {

security/manager/ssl/src/nsIdentityChecking.cpp

@@ -1233,10 +1233,7 @@ nsNSSCertificate::hasValidEVOidTag(SECOidTag &resultOidTag, bool &validEV)
     CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
     | CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE;
 
-  // We need a PRUint64 here instead of a nice int64_t (until bug 634793 is
-  // fixed) to match the type used in security/nss/lib/certdb/certt.h for
-  // cert_rev_flags_per_method.
-  PRUint64 methodFlags[2];
+  uint64_t methodFlags[2];
   methodFlags[cert_revocation_method_crl] = revMethodFlags;
   methodFlags[cert_revocation_method_ocsp] = revMethodFlags;
 

toolkit/profile/nsToolkitProfileService.cpp

@@ -859,7 +859,7 @@ nsToolkitProfileService::CreateTimesInternal(nsIFile* aProfileDir)
     NS_ENSURE_SUCCESS(rv, rv);
 
     // We don't care about microsecond resolution.
-    PRInt64 msec;
+    int64_t msec;
     LL_DIV(msec, PR_Now(), PR_USEC_PER_MSEC);
 
     // Write it out.

widget/gonk/HwcComposer2D.cpp

@@ -266,7 +266,7 @@ HwcComposer2D::PrepareLayerList(Layer* aLayer,
         container->SortChildrenBy3DZOrder(children);
 
         //FIXME/bug 810334
-        for (PRUint32 i = 0; i < children.Length(); i++) {
+        for (uint32_t i = 0; i < children.Length(); i++) {
             if (!PrepareLayerList(children[i], aClip)) {
                 return false;
             }