From ac35497057700a72bd3f0f249790999eef8ba103 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 7 Nov 2012 20:34:50 -0500
Subject: [PATCH] Bug 579517 follow-up: Remove NSPR types that crept in

---
 content/events/src/nsEventListenerManager.cpp | 4 ++--
 dom/file/ArchiveRequest.cpp                   | 2 +-
 dom/network/src/MobileConnection.cpp          | 2 +-
 startupcache/test/TestStartupCache.cpp        | 2 +-
 widget/windows/WinUtils.cpp                   | 4 ++--
 xpcom/io/nsLocalFileWin.cpp                   | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index a21d5f89187..eaefdca36e0 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -1012,7 +1012,7 @@ nsEventListenerManager::AddListenerForAllEvents(nsIDOMEventListener* aListener,
                                                 bool aWantsUntrusted,
                                                 bool aSystemEventGroup)
 {
-  PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
+  int32_t flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
   if (aWantsUntrusted) {
     flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
   }
@@ -1027,7 +1027,7 @@ nsEventListenerManager::RemoveListenerForAllEvents(nsIDOMEventListener* aListene
                                                    bool aUseCapture,
                                                    bool aSystemEventGroup)
 {
-  PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
+  int32_t flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
   if (aSystemEventGroup) {
     flags |= NS_EVENT_FLAG_SYSTEM_EVENT;
   }
diff --git a/dom/file/ArchiveRequest.cpp b/dom/file/ArchiveRequest.cpp
index 199a9c65de5..37883d84a75 100644
--- a/dom/file/ArchiveRequest.cpp
+++ b/dom/file/ArchiveRequest.cpp
@@ -236,7 +236,7 @@ ArchiveRequest::GetFilesResult(JSContext* aCx,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  for (PRUint32 i = 0; i < aFileList.Length(); ++i) {
+  for (uint32_t i = 0; i < aFileList.Length(); ++i) {
     nsCOMPtr<nsIDOMFile> file = aFileList[i];
 
     JS::Value value;
diff --git a/dom/network/src/MobileConnection.cpp b/dom/network/src/MobileConnection.cpp
index d7905c62169..56220f74c4c 100644
--- a/dom/network/src/MobileConnection.cpp
+++ b/dom/network/src/MobileConnection.cpp
@@ -398,7 +398,7 @@ MobileConnection::CancelMMI(nsIDOMDOMRequest** request)
 }
 
 NS_IMETHODIMP
-MobileConnection::GetCallForwardingOption(PRUint16 aReason,
+MobileConnection::GetCallForwardingOption(uint16_t aReason,
                                           nsIDOMDOMRequest** aRequest)
 {
   *aRequest = nullptr;
diff --git a/startupcache/test/TestStartupCache.cpp b/startupcache/test/TestStartupCache.cpp
index 4cbf30044b6..ccd0657d461 100644
--- a/startupcache/test/TestStartupCache.cpp
+++ b/startupcache/test/TestStartupCache.cpp
@@ -313,7 +313,7 @@ TestIgnoreDiskCache(nsIFile* profileDir) {
   const char* buf = "Get a Beardbook app for your smartphone";
   const char* id = "id";
   char* outbuf = NULL;
-  PRUint32 len;
+  uint32_t len;
   
   rv = sc->PutBuffer(id, buf, strlen(buf) + 1);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 99b80e735c5..43e412918d3 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -909,7 +909,7 @@ WinUtils::ConvertHRGNToRegion(HRGN aRgn)
   nsIntRegion rgn;
 
   DWORD size = ::GetRegionData(aRgn, 0, NULL);
-  nsAutoTArray<PRUint8,100> buffer;
+  nsAutoTArray<uint8_t,100> buffer;
   if (!buffer.SetLength(size))
     return rgn;
 
@@ -923,7 +923,7 @@ WinUtils::ConvertHRGNToRegion(HRGN aRgn)
   }
 
   RECT* rects = reinterpret_cast<RECT*>(data->Buffer);
-  for (PRUint32 i = 0; i < data->rdh.nCount; ++i) {
+  for (uint32_t i = 0; i < data->rdh.nCount; ++i) {
     RECT* r = rects + i;
     rgn.Or(rgn, ToIntRect(*r));
   }
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index 980ce0a6391..0beb20564de 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -592,8 +592,8 @@ OpenFile(const nsAFlatString &name, int osflags, int mode,
 {
     int32_t access = 0;
 
-    PRInt32 disposition = 0;
-    PRInt32 attributes = 0;
+    int32_t disposition = 0;
+    int32_t attributes = 0;
 
     if (osflags & PR_SYNC) 
         attributes = FILE_FLAG_WRITE_THROUGH;