Moved the typedef to its own file: "nsWeakPtr.h". This avoids the circular includes problem and lets people #include just "nsWeakPtr.h" when they want an |nsWeakPtr|.

xpcom/base/MANIFEST

@@ -10,4 +10,5 @@ nsIPtr.h
 nsISupportsUtils.h
 nsTraceRefcnt.h
 nsWeakReference.h
+nsWeakPtr.h
 nscore.h

xpcom/base/Makefile.in

@@ -57,6 +57,7 @@ EXPORTS = \
         nsISupportsUtils.h \
         nsTraceRefcnt.h    \
         nsWeakReference.h  \
+        nsWeakPtr.h        \
         nscore.h           \
 	$(NULL)
 

xpcom/base/makefile.win

@@ -36,6 +36,7 @@ EXPORTS =                  \
         nsISupportsUtils.h \
         nsTraceRefcnt.h    \
         nsWeakReference.h  \
+        nsWeakPtr.h        \
         nscore.h           \
         $(NULL)			
 

xpcom/base/nsCOMPtr.h

@@ -864,7 +864,4 @@ CallQueryInterface( nsISupports* aSource, nsCOMPtr<DestinationType>* aDestinatio
     	// this calls the _other_ |CallQueryInterface|
   }
 
-typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
-
-
 #endif // !defined(nsCOMPtr_h___)

xpcom/base/nsIWeakReference.idl

@@ -17,7 +17,7 @@ interface nsISupportsWeakReference : nsISupports
 %{C++
 
 // typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
-	// ...this definition actually exists in nsCOMPtr.h, sorry
+	// ...this definition had to be moved to nsWeakPtr.h to avoid circular includes, sorry
 
 nsIWeakReference* NS_GetWeakReference( nsISupports* );
 	// ...convenience.  Get a weak reference (if possible) without doing the query yourself

xpcom/glue/nsCOMPtr.h

@@ -864,7 +864,4 @@ CallQueryInterface( nsISupports* aSource, nsCOMPtr<DestinationType>* aDestinatio
     	// this calls the _other_ |CallQueryInterface|
   }
 
-typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
-
-
 #endif // !defined(nsCOMPtr_h___)