Bug 366619 - "Move nsAutoLock and nsAutoMonitor to the glue". nsAutoLock.cpp and nsAutoLock.h were moved from xpcom/threads, see there for CVS history. r=bsmedberg.

xpcom/glue/Makefile.in

@@ -72,6 +72,7 @@ SDK_HEADERS = \
 		pldhash.h \
 		nsArrayEnumerator.h \
 		nsArrayUtils.h \
+		nsAutoLock.h \
 		nsBaseHashtable.h \
 		nsCOMArray.h \
 		nsCRTGlue.h \

xpcom/glue/nsAutoLock.h

@@ -115,7 +115,7 @@
  * This is the base class for the stack-based locking objects.
  * Clients of derived classes need not play with this superclass.
  **/
-class NS_COM nsAutoLockBase {
+class NS_COM_GLUE nsAutoLockBase {
     friend class nsAutoUnlockBase;
 
 protected:
@@ -146,7 +146,7 @@ protected:
  * This is the base class for stack-based unlocking objects.
  * It unlocks locking objects based on nsAutoLockBase.
  **/
-class NS_COM nsAutoUnlockBase {
+class NS_COM_GLUE nsAutoUnlockBase {
 protected:
     nsAutoUnlockBase() {}
 
@@ -165,7 +165,7 @@ protected:
  * nsAutoLock
  * Stack-based locking object for PRLock.
  **/
-class NS_COM nsAutoLock : public nsAutoLockBase {
+class NS_COM_GLUE nsAutoLock : public nsAutoLockBase {
 private:
     PRLock* mLock;
     PRBool mLocked;
@@ -254,7 +254,7 @@ public:
 #include "nsError.h"
 #include "nsDebug.h"
 
-class NS_COM nsAutoMonitor : public nsAutoLockBase {
+class NS_COM_GLUE nsAutoMonitor : public nsAutoLockBase {
 public:
 
     /**
@@ -368,7 +368,7 @@ private:
 #include "prcmon.h"
 #include "nsError.h"
 
-class NS_COM nsAutoCMonitor : public nsAutoLockBase {
+class NS_COM_GLUE nsAutoCMonitor : public nsAutoLockBase {
 public:
     nsAutoCMonitor(void* lockObject)
         : nsAutoLockBase(lockObject, eAutoCMonitor),

xpcom/glue/objs.mk

@@ -71,6 +71,7 @@ XPCOM_GLUE_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/, $(XPCOM_GLUE_SRC_
 # only build it for the dependent XPCOM glue and builtin to xpcom-core.
 
 XPCOM_GLUENS_SRC_LCPPSRCS =      \
+  nsAutoLock.cpp                 \
   nsGenericFactory.cpp           \
   nsProxyRelease.cpp             \
   $(NULL)

xpcom/threads/Makefile.in

@@ -56,7 +56,6 @@ REQUIRES	= string \
 		  $(NULL)
 
 CPPSRCS		= \
-		nsAutoLock.cpp \
 		nsEventQueue.cpp \
 		nsEnvironment.cpp \
 		nsThread.cpp \
@@ -68,7 +67,6 @@ CPPSRCS		= \
 		$(NULL)
 
 EXPORTS		= \
-		nsAutoLock.h \
 		nsProcess.h \
 		nsEventQueue.h \
 		$(NULL)