From 532e1d6cc7bd07bfbb0729632f980a8fbfc5e384 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 21 Jun 2011 18:59:20 +0200
Subject: [PATCH] Backed out changeset 2783e9b15954 (bug 665833) due to
 oranges.

---
 layout/style/nsStyleStruct.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 6e1e71ae1dad..172e76047fc5 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -53,7 +53,7 @@
 #include "nsPresContext.h"
 #include "nsIWidget.h"
 #include "nsIStyleRule.h"
-#include "nsCRTGlue.h"
+#include "nsCRT.h"
 #include "nsCSSProps.h"
 
 #include "nsCOMPtr.h"
@@ -1444,7 +1444,7 @@ nsStyleImage::SetNull()
   else if (mType == eStyleImageType_Image)
     NS_RELEASE(mImage);
   else if (mType == eStyleImageType_Element)
-    NS_Free(mElementId);
+    nsCRT::free(mElementId);
 
   mType = eStyleImageType_Null;
   mCropRect = nsnull;
@@ -1527,7 +1527,7 @@ nsStyleImage::SetElementId(const PRUnichar* aElementId)
     SetNull();
 
   if (aElementId) {
-    mElementId = NS_strdup(aElementId);
+    mElementId = nsCRT::strdup(aElementId);
     mType = eStyleImageType_Element;
   }
 }
@@ -1685,7 +1685,7 @@ nsStyleImage::operator==(const nsStyleImage& aOther) const
     return *mGradient == *aOther.mGradient;
 
   if (mType == eStyleImageType_Element)
-    return NS_strcmp(mElementId, aOther.mElementId) == 0;
+    return nsCRT::strcmp(mElementId, aOther.mElementId) == 0;
 
   return PR_TRUE;
 }
@@ -2306,7 +2306,7 @@ PRBool nsStyleContentData::operator==(const nsStyleContentData& aOther) const
   if (mType == eStyleContentType_Counter ||
       mType == eStyleContentType_Counters)
     return *mContent.mCounters == *aOther.mContent.mCounters;
-  return NS_strcmp(mContent.mString, aOther.mContent.mString) == 0;
+  return nsCRT::strcmp(mContent.mString, aOther.mContent.mString) == 0;
 }
 
 void