Bug 579517 follow-up: Remove NSPR types that crept in
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 14 Sep 2012 14:55:01 -0400
changeset 107216 0b3f5ceb618a55680997e1ca470585c526182f14
parent 107215 b4ce18b3224175c69b3228a83d3022956effccde
child 107217 2a64d6b2f11049369920ec2ce4e2fa5830c9ae73
push id74
push usershu@rfrn.org
push dateTue, 18 Sep 2012 19:23:47 +0000
bugs579517
milestone18.0a1
Bug 579517 follow-up: Remove NSPR types that crept in
dom/base/nsDOMWindowUtils.cpp
js/src/ion/Ion.cpp
js/xpconnect/src/XPCStack.cpp
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -2807,17 +2807,17 @@ nsDOMWindowUtils::ExitFullscreen()
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
   nsIDocument::ExitFullScreen(/* async = */ false);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsDOMWindowUtils::SelectAtPoint(float aX, float aY, PRUint32 aSelectBehavior,
+nsDOMWindowUtils::SelectAtPoint(float aX, float aY, uint32_t aSelectBehavior,
                                 bool *_retval)
 {
   *_retval = false;
   if (!IsUniversalXPConnectCapable()) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
   nsSelectionAmount amount;
@@ -2880,17 +2880,17 @@ nsDOMWindowUtils::SelectAtPoint(float aX
     static_cast<nsFrame*>(targetFrame)->
       SelectByTypeAtPoint(GetPresContext(), relPoint, amount, amount,
                           nsFrame::SELECT_ACCUMULATE);
   *_retval = !NS_FAILED(rv);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsDOMWindowUtils::LoadSheet(nsIURI *aSheetURI, PRUint32 aSheetType)
+nsDOMWindowUtils::LoadSheet(nsIURI *aSheetURI, uint32_t aSheetType)
 {
   if (!IsUniversalXPConnectCapable()) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
   NS_ENSURE_ARG_POINTER(aSheetURI);
   NS_ENSURE_ARG(aSheetType == AGENT_SHEET || aSheetType == USER_SHEET);
 
@@ -2911,17 +2911,17 @@ nsDOMWindowUtils::LoadSheet(nsIURI *aShe
 
   rv = doc->LoadAdditionalStyleSheet(type, aSheetURI);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsDOMWindowUtils::RemoveSheet(nsIURI *aSheetURI, PRUint32 aSheetType)
+nsDOMWindowUtils::RemoveSheet(nsIURI *aSheetURI, uint32_t aSheetType)
 {
   if (!IsUniversalXPConnectCapable()) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
   NS_ENSURE_ARG_POINTER(aSheetURI);
   NS_ENSURE_ARG(aSheetType == AGENT_SHEET || aSheetType == USER_SHEET);
 
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -48,17 +48,17 @@ using namespace js::ion;
 // Global variables.
 IonOptions ion::js_IonOptions;
 
 // Assert that IonCode is gc::Cell aligned.
 JS_STATIC_ASSERT(sizeof(IonCode) % gc::Cell::CellSize == 0);
 
 #ifdef JS_THREADSAFE
 static bool IonTLSInitialized = false;
-static PRUintn IonTLSIndex;
+static unsigned IonTLSIndex;
 
 static inline IonContext *
 CurrentIonContext()
 {
     return (IonContext *)PR_GetThreadPrivate(IonTLSIndex);
 }
 
 bool
--- a/js/xpconnect/src/XPCStack.cpp
+++ b/js/xpconnect/src/XPCStack.cpp
@@ -11,17 +11,17 @@
 class XPCJSStackFrame : public nsIStackFrame
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSISTACKFRAME
 
     static nsresult CreateStack(JSContext* cx, XPCJSStackFrame** stack);
 
-    static nsresult CreateStackFrameLocation(PRUint32 aLanguage,
+    static nsresult CreateStackFrameLocation(uint32_t aLanguage,
                                              const char* aFilename,
                                              const char* aFunctionName,
                                              int32_t aLineNumber,
                                              nsIStackFrame* aCaller,
                                              XPCJSStackFrame** stack);
 
     XPCJSStackFrame();
     virtual ~XPCJSStackFrame();