more fixes for dbaron

content/base/src/nsStyleContext.cpp

@@ -2007,7 +2007,7 @@ private:  // all data and methods private: only friends have access
   PRUint32                mRefCnt;
   PRUint32                mCRC;
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
   static PRUint32         gInstanceCount;
 #endif
 };
@@ -2038,7 +2038,7 @@ PRUint32 nsStyleContextData::Release(void)
   return mRefCnt;
 }
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
 /*static*/ PRUint32 nsStyleContextData::gInstanceCount;
 #endif  // DEBUG
 

layout/base/src/nsFrameImageLoader.cpp

@@ -270,7 +270,8 @@ nsFrameImageLoader::StopImageLoad(PRBool aStopChrome)
           return NS_ERROR_FAILURE;
   }
 
-  PRINTF("    %p: stopping %s\n", this, mURL);
+  nsCAutoString tmp; tmp.AssignWithConversion(mURL);
+  PRINTF("    %p: stopping %s\n", this, tmp.GetBuffer());
   if (nsnull != mImageRequest) {
     mImageRequest->RemoveObserver(this);
     NS_RELEASE(mImageRequest);
@@ -462,7 +463,8 @@ nsFrameImageLoader::Notify(nsIImageRequest *aImageRequest,
 
   mNotifyLockCount++;
 
-  PRINTF("%p: loading %s", this, mURL);
+  nsCAutoString tmp; tmp.AssignWithConversion(mURL);
+  PRINTF("%p: loading %s", this, tmp.GetBuffer());
   PRINTF(" notification=%d params=%d,%d,%p\n", aNotificationType,
          aParam1, aParam2, aParam3);
   switch (aNotificationType) {

layout/base/src/nsStyleContext.cpp

@@ -2007,7 +2007,7 @@ private:  // all data and methods private: only friends have access
   PRUint32                mRefCnt;
   PRUint32                mCRC;
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
   static PRUint32         gInstanceCount;
 #endif
 };
@@ -2038,7 +2038,7 @@ PRUint32 nsStyleContextData::Release(void)
   return mRefCnt;
 }
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
 /*static*/ PRUint32 nsStyleContextData::gInstanceCount;
 #endif  // DEBUG
 

layout/generic/nsFrame.h

@@ -388,7 +388,8 @@ public:
     if (NS_SUCCEEDED(aFrame->QueryInterface(NS_GET_IID(nsIFrameDebug), (void**)&frameDebug))) {
       frameDebug->GetFrameName(tmp);
     }
-    fprintf(out, "%s@%p", tmp, aFrame);
+    nsCAutoString tmp2; tmp2.AssignWithConversion(tmp);
+    fprintf(out, "%s@%p", tmp2.GetBuffer(), aFrame);
   }
 
   static void IndentBy(FILE* out, PRInt32 aIndent) {

layout/html/base/src/nsFrame.h

@@ -388,7 +388,8 @@ public:
     if (NS_SUCCEEDED(aFrame->QueryInterface(NS_GET_IID(nsIFrameDebug), (void**)&frameDebug))) {
       frameDebug->GetFrameName(tmp);
     }
-    fprintf(out, "%s@%p", tmp, aFrame);
+    nsCAutoString tmp2; tmp2.AssignWithConversion(tmp);
+    fprintf(out, "%s@%p", tmp2.GetBuffer(), aFrame);
   }
 
   static void IndentBy(FILE* out, PRInt32 aIndent) {

layout/style/nsStyleContext.cpp

@@ -2007,7 +2007,7 @@ private:  // all data and methods private: only friends have access
   PRUint32                mRefCnt;
   PRUint32                mCRC;
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
   static PRUint32         gInstanceCount;
 #endif
 };
@@ -2038,7 +2038,7 @@ PRUint32 nsStyleContextData::Release(void)
   return mRefCnt;
 }
 
-#ifdef DEBUG
+#ifdef NS_ENABLE_LOGGING
 /*static*/ PRUint32 nsStyleContextData::gInstanceCount;
 #endif  // DEBUG