From 4920294cee0fdfb00aa002b286e068707161a944 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com"
 <warren%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 28 Oct 2000 01:28:06 +0000
Subject: [PATCH] more fixes for dbaron

git-svn-id: svn://10.0.0.236/trunk@81913 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsStyleContext.cpp    | 4 ++--
 mozilla/layout/base/src/nsFrameImageLoader.cpp | 6 ++++--
 mozilla/layout/base/src/nsStyleContext.cpp     | 4 ++--
 mozilla/layout/generic/nsFrame.h               | 3 ++-
 mozilla/layout/html/base/src/nsFrame.h         | 3 ++-
 mozilla/layout/style/nsStyleContext.cpp        | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp
index 43c6dfd18fe..40d6430b03c 100644
--- a/mozilla/content/base/src/nsStyleContext.cpp
+++ b/mozilla/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
 
diff --git a/mozilla/layout/base/src/nsFrameImageLoader.cpp b/mozilla/layout/base/src/nsFrameImageLoader.cpp
index 63a5e6f194b..5ea89570fd5 100644
--- a/mozilla/layout/base/src/nsFrameImageLoader.cpp
+++ b/mozilla/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) {
diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp
index 43c6dfd18fe..40d6430b03c 100644
--- a/mozilla/layout/base/src/nsStyleContext.cpp
+++ b/mozilla/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
 
diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h
index 697f63f1e83..80dc4f8e76c 100644
--- a/mozilla/layout/generic/nsFrame.h
+++ b/mozilla/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) {
diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h
index 697f63f1e83..80dc4f8e76c 100644
--- a/mozilla/layout/html/base/src/nsFrame.h
+++ b/mozilla/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) {
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 43c6dfd18fe..40d6430b03c 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/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