Followup to bug 348748 to fix the alignment of trailing backslashes in macros
authorneil@parkwaycc.co.uk
Wed, 11 Jul 2007 01:46:44 -0700
changeset 3327 bd18810c21b83f992be2c377603ecf54dbb1d43d
parent 3326 98247c86a73b76208776b4e4994dbf9d66819b36
child 3328 f7b33f0bbf81a609a6aadb2fee1922b83e93fd7b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs348748
milestone1.9a7pre
Followup to bug 348748 to fix the alignment of trailing backslashes in macros [xxx_cast<foo*>(bar) is three characters shorter than NS_XXX_CAST(foo*, bar)]
content/base/public/nsContentUtils.h
content/html/content/src/nsGenericHTMLElement.h
content/xslt/src/xpath/txNodeSet.cpp
dom/src/base/nsGlobalWindowCommands.cpp
editor/composer/src/nsComposerController.cpp
editor/libeditor/base/nsEditorController.cpp
js/src/xpconnect/src/XPCDispPrivate.h
js/src/xpconnect/src/xpccomponents.cpp
js/src/xpconnect/src/xpcruntimesvc.cpp
js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.cpp
layout/generic/nsIFrame.h
layout/style/nsRuleNode.cpp
layout/style/nsStyleContext.cpp
modules/libpr0n/public/ImageLogging.h
xpcom/base/nsAgg.h
xpcom/base/nsCycleCollectionParticipant.h
xpcom/ds/nsDoubleHashtable.h
xpcom/glue/nsIClassInfoImpl.h
xpcom/glue/nsISupportsImpl.h
xpcom/string/src/nsSubstringTuple.cpp
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1200,16 +1200,16 @@ private:
   nsAutoGCRoot NS_AUTO_GCROOT_PASTE(_autoGCRoot_, __LINE__) \
   (ptr, result)
 
 #define NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(_class)                      \
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(_class)
 
 #define NS_INTERFACE_MAP_ENTRY_TEAROFF(_interface, _allocator)                \
   if (aIID.Equals(NS_GET_IID(_interface))) {                                  \
-    foundInterface = static_cast<_interface *>(_allocator);                \
+    foundInterface = static_cast<_interface *>(_allocator);                   \
     if (!foundInterface) {                                                    \
       *aInstancePtr = nsnull;                                                 \
       return NS_ERROR_OUT_OF_MEMORY;                                          \
     }                                                                         \
   } else
 
 #endif /* nsContentUtils_h___ */
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -1098,17 +1098,17 @@ NS_NewHTML##_elementName##Element(nsINod
                                                                               \
     nsresult rv;                                                              \
                                                                               \
     rv = _base::QueryInterface(aIID, aInstancePtr);                           \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
-    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,            \
+    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,               \
                            aInstancePtr);                                     \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
     nsISupports *foundInterface = nsnull;
 
 
@@ -1129,17 +1129,17 @@ NS_NewHTML##_elementName##Element(nsINod
                                                                               \
     nsresult rv;                                                              \
                                                                               \
     rv = _base::QueryInterface(aIID, aInstancePtr);                           \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
-    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,            \
+    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,               \
                            aInstancePtr);                                     \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
     nsISupports *foundInterface = nsnull;
 
 #define NS_HTML_CONTENT_CC_INTERFACE_MAP_BEGIN(_class, _base)                 \
--- a/content/xslt/src/xpath/txNodeSet.cpp
+++ b/content/xslt/src/xpath/txNodeSet.cpp
@@ -43,22 +43,22 @@
 
 /**
  * Implementation of an XPath nodeset
  */
 
 #ifdef NS_BUILD_REFCNT_LOGGING
 #define LOG_CHUNK_MOVE(_start, _new_start, _count)            \
 {                                                             \
-    txXPathNode *start = const_cast<txXPathNode*>(_start); \
+    txXPathNode *start = const_cast<txXPathNode*>(_start);    \
     while (start < _start + _count) {                         \
         NS_LogDtor(start, "txXPathNode", sizeof(*start));     \
         ++start;                                              \
     }                                                         \
-    start = const_cast<txXPathNode*>(_new_start);          \
+    start = const_cast<txXPathNode*>(_new_start);             \
     while (start < _new_start + _count) {                     \
         NS_LogCtor(start, "txXPathNode", sizeof(*start));     \
         ++start;                                              \
     }                                                         \
 }
 #else
 #define LOG_CHUNK_MOVE(_start, _new_start, _count)
 #endif
--- a/dom/src/base/nsGlobalWindowCommands.cpp
+++ b/dom/src/base/nsGlobalWindowCommands.cpp
@@ -899,34 +899,34 @@ nsClipboardDragDropHookCommand::GetComma
 ----------------------------------------------------------------------------*/
 
 #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName)                \
   {                                                                 \
     _cmdClass* theCmd;                                              \
     NS_NEWXPCOM(theCmd, _cmdClass);                                 \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   static_cast<nsIControllerCommand *>(theCmd)); \
+                   static_cast<nsIControllerCommand *>(theCmd));    \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)              \
   {                                                                 \
     _cmdClass* theCmd;                                              \
     NS_NEWXPCOM(theCmd, _cmdClass);                                 \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
                    static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)               \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
                    static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)               \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   static_cast<nsIControllerCommand *>(theCmd)); \
+                   static_cast<nsIControllerCommand *>(theCmd));    \
   }
 
 
 // static
 nsresult
 nsWindowCommandRegistration::RegisterWindowCommands(
                                nsIControllerCommandTable *inCommandTable)
 {
--- a/editor/composer/src/nsComposerController.cpp
+++ b/editor/composer/src/nsComposerController.cpp
@@ -43,50 +43,50 @@
 #include "nsComposerCommands.h"
 
 #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName)                    \
   {                                                                     \
     _cmdClass* theCmd;                                                  \
     NS_NEWXPCOM(theCmd, _cmdClass);                                     \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       static_cast<nsIControllerCommand *>(theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd));    \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                  \
   {                                                                     \
     _cmdClass* theCmd;                                                  \
     NS_NEWXPCOM(theCmd, _cmdClass);                                     \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
                        static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                   \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
                         static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                   \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       static_cast<nsIControllerCommand *>(theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd));    \
   }
 
 #define NS_REGISTER_STYLE_COMMAND(_cmdClass, _cmdName, _styleTag)       \
   {                                                                     \
     _cmdClass* theCmd = new _cmdClass(_styleTag);                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       static_cast<nsIControllerCommand *>(theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd));    \
   }
   
 #define NS_REGISTER_TAG_COMMAND(_cmdClass, _cmdName, _tagName)          \
   {                                                                     \
     _cmdClass* theCmd = new _cmdClass(_tagName);                        \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       static_cast<nsIControllerCommand *>(theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd));    \
   }
   
 
 // static
 nsresult
 nsComposerController::RegisterEditorDocStateCommands(
                         nsIControllerCommandTable *inCommandTable)
 {
--- a/editor/libeditor/base/nsEditorController.cpp
+++ b/editor/libeditor/base/nsEditorController.cpp
@@ -46,34 +46,34 @@
 
 
 #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName)                                      \
   {                                                                                       \
     _cmdClass* theCmd;                                                                    \
     NS_NEWXPCOM(theCmd, _cmdClass);                                                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                                           \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   static_cast<nsIControllerCommand *>(theCmd));       \
+                                   static_cast<nsIControllerCommand *>(theCmd));          \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                                    \
   {                                                                                       \
     _cmdClass* theCmd;                                                                    \
     NS_NEWXPCOM(theCmd, _cmdClass);                                                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                                           \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
                                    static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
                                    static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   static_cast<nsIControllerCommand *>(theCmd));       \
+                                   static_cast<nsIControllerCommand *>(theCmd));          \
   }
 
 
 // static
 nsresult nsEditorController::RegisterEditorCommands(nsIControllerCommandTable *inCommandTable)
 {
   nsresult rv;
  
--- a/js/src/xpconnect/src/XPCDispPrivate.h
+++ b/js/src/xpconnect/src/XPCDispPrivate.h
@@ -86,17 +86,17 @@ STDMETHODIMP _class::QueryInterface(REFI
   NS_ASSERTION(aInstancePtr,                                                  \
                "QueryInterface requires a non-NULL destination!");            \
   if( !aInstancePtr )                                                         \
     return E_POINTER;                                                         \
   IUnknown* foundInterface;
 
 #define NS_IMPL_COM_QUERY_BODY(_interface)                                    \
   if(IsEqualIID(aIID, __uuidof(_interface)) )                                 \
-    foundInterface = static_cast<_interface*>(this);                       \
+    foundInterface = static_cast<_interface*>(this);                          \
   else
 
 #define NS_IMPL_COM_QUERY_TAIL_GUTS                                           \
     foundInterface = 0;                                                       \
   HRESULT status;                                                             \
   if( !foundInterface )                                                       \
     status = E_NOINTERFACE;                                                   \
   else                                                                        \
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/src/xpconnect/src/xpccomponents.cpp
@@ -117,17 +117,17 @@ nsXPCComponents_Interfaces::GetInterface
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIScriptableInterfaces)
     PUSH_IID(nsIXPCScriptable)
 #ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
@@ -462,17 +462,17 @@ nsXPCComponents_InterfacesByID::GetInter
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIScriptableInterfacesByID)
     PUSH_IID(nsIXPCScriptable)
 #ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
@@ -793,17 +793,17 @@ nsXPCComponents_Classes::GetInterfaces(P
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_Classes)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -1048,17 +1048,17 @@ nsXPCComponents_ClassesByID::GetInterfac
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_ClassesByID)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -1322,17 +1322,17 @@ nsXPCComponents_Results::GetInterfaces(P
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_Results)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -1554,17 +1554,17 @@ nsXPCComponents_ID::GetInterfaces(PRUint
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_ID)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -1781,17 +1781,17 @@ nsXPCComponents_Exception::GetInterfaces
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_Exception)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -2074,17 +2074,17 @@ nsXPCConstructor::GetInterfaces(PRUint32
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCConstructor)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -2339,17 +2339,17 @@ nsXPCComponents_Constructor::GetInterfac
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents_Constructor)
     PUSH_IID(nsIXPCScriptable)
 #undef PUSH_IID
@@ -3673,17 +3673,17 @@ nsXPCComponents::GetInterfaces(PRUint32 
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCComponents)
     PUSH_IID(nsIXPCScriptable)
 #ifdef XPC_USE_SECURITY_CHECKED_COMPONENT
--- a/js/src/xpconnect/src/xpcruntimesvc.cpp
+++ b/js/src/xpconnect/src/xpcruntimesvc.cpp
@@ -95,17 +95,17 @@ BackstagePass::GetInterfaces(PRUint32 *a
     nsIID **array;
     *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ),   \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
     array[index++] = clone;
 
     PUSH_IID(nsIXPCScriptable)
 #ifndef XPCONNECT_STANDALONE
     PUSH_IID(nsIScriptObjectPrincipal)
--- a/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.cpp
+++ b/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.cpp
@@ -39,17 +39,17 @@ bool CompareVariant(const _variant_t & l
 {
     return left == right;
 }
 
 // These should be a template but VC++6 is brain dead in this area
 #define CompareFunction(type)                                               \
 bool CompareVariant##type(const _variant_t & left, const _variant_t & right)     \
 {                                                                           \
-    return static_cast<type>(left) == static_cast<type>(right);   \
+    return static_cast<type>(left) == static_cast<type>(right);             \
 }
 
 CompareFunction(long);
 CompareFunction(float);
 CompareFunction(double);
 CompareFunction(_bstr_t);
 
 DISPID GetIDsOfNames(IDispatch * pIDispatch , char const * i_Method)
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -611,17 +611,17 @@ public:
   #define STYLE_STRUCT(name_, checkdata_cb_, ctor_args_)                      \
     const nsStyle##name_ * GetStyle##name_ () const {                         \
       NS_ASSERTION(mStyleContext, "No style context found!");                 \
       return mStyleContext->GetStyle##name_ ();                               \
     }
 #else
   #define STYLE_STRUCT(name_, checkdata_cb_, ctor_args_)                      \
     const nsStyle##name_ * GetStyle##name_ () const {                         \
-      return static_cast<const nsStyle##name_*>(\
+      return static_cast<const nsStyle##name_*>(                              \
                             GetStyleDataExternal(eStyleStruct_##name_));      \
     }
 #endif
   #include "nsStyleStructList.h"
   #undef STYLE_STRUCT
 
   /**
    * These methods are to access any additional style contexts that
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1758,28 +1758,28 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyle
  *                    context's data for this struct.
  * @param rdtype_ The nsCSS* struct type used to compute this struct's data.
  * @param rdata_ Variable (declared here) holding the nsCSS* used here.
  */
 #define COMPUTE_START_INHERITED(type_, ctorargs_, data_, parentdata_, rdtype_, rdata_) \
   nsStyleContext* parentContext = aContext->GetParent();                      \
                                                                               \
   const nsRuleData##rdtype_& rdata_ =                                         \
-    static_cast<const nsRuleData##rdtype_&>(aData);                        \
+    static_cast<const nsRuleData##rdtype_&>(aData);                           \
   nsStyle##type_* data_ = nsnull;                                             \
   const nsStyle##type_* parentdata_ = nsnull;                                 \
   PRBool inherited = aInherited;                                              \
                                                                               \
   if (parentContext && aRuleDetail != eRuleFullReset)                         \
     parentdata_ = parentContext->GetStyle##type_();                           \
   if (aStartStruct)                                                           \
     /* We only need to compute the delta between this computed data and */    \
     /* our computed data. */                                                  \
     data_ = new (mPresContext)                                                \
-            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));   \
+            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));      \
   else {                                                                      \
     /* XXXldb What about eRuleFullInherited?  Which path is faster? */        \
     if (aRuleDetail != eRuleFullMixed && aRuleDetail != eRuleFullReset) {     \
       /* No question. We will have to inherit. Go ahead and init */           \
       /* with inherited vals from parent. */                                  \
       inherited = PR_TRUE;                                                    \
       if (parentdata_)                                                        \
         data_ = new (mPresContext) nsStyle##type_(*parentdata_);              \
@@ -1806,23 +1806,23 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyle
  *                    context's data for this struct.
  * @param rdtype_ The nsCSS* struct type used to compute this struct's data.
  * @param rdata_ Variable (declared here) holding the nsCSS* used here.
  */
 #define COMPUTE_START_RESET(type_, ctorargs_, data_, parentdata_, rdtype_, rdata_) \
   nsStyleContext* parentContext = aContext->GetParent();                      \
                                                                               \
   const nsRuleData##rdtype_& rdata_ =                                         \
-    static_cast<const nsRuleData##rdtype_&>(aData);                        \
+    static_cast<const nsRuleData##rdtype_&>(aData);                           \
   nsStyle##type_* data_;                                                      \
   if (aStartStruct)                                                           \
     /* We only need to compute the delta between this computed data and */    \
     /* our computed data. */                                                  \
     data_ = new (mPresContext)                                                \
-            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));   \
+            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));      \
   else                                                                        \
     data_ = new (mPresContext) nsStyle##type_ ctorargs_;                      \
                                                                               \
   if (NS_UNLIKELY(!data_))                                                    \
     return nsnull;  /* Out Of Memory */                                       \
                                                                               \
   const nsStyle##type_* parentdata_ = data_;                                  \
   if (parentContext &&                                                        \
@@ -4639,24 +4639,24 @@ nsRuleNode::GetStyle##name_(nsStyleConte
   data = mStyleData.GetStyle##name_();                                        \
   if (NS_LIKELY(data != nsnull))                                              \
     return data;                                                              \
                                                                               \
   if (NS_UNLIKELY(!aComputeData))                                             \
     return nsnull;                                                            \
                                                                               \
   data =                                                                      \
-    static_cast<const nsStyle##name_ *>(Get##name_##Data(aContext));       \
+    static_cast<const nsStyle##name_ *>(Get##name_##Data(aContext));          \
                                                                               \
   if (NS_LIKELY(data != nsnull))                                              \
     return data;                                                              \
                                                                               \
   NS_NOTREACHED("could not create style struct");                             \
   return                                                                      \
-    static_cast<const nsStyle##name_ *>(\
+    static_cast<const nsStyle##name_ *>(                                      \
                    mPresContext->PresShell()->StyleSet()->                    \
                      DefaultStyleData()->GetStyleData(eStyleStruct_##name_)); \
 }
 #include "nsStyleStructList.h"
 #undef STYLE_STRUCT
 
 void
 nsRuleNode::Mark()
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@@ -263,17 +263,17 @@ nsStyleContext::GetUniqueStyleData(const
 
   nsStyleStruct* result;
   nsPresContext *presContext = PresContext();
   switch (aSID) {
 
 #define UNIQUE_CASE(c_)                                                       \
   case eStyleStruct_##c_:                                                     \
     result = new (presContext) nsStyle##c_(                                   \
-      * static_cast<const nsStyle##c_ *>(current));                        \
+      * static_cast<const nsStyle##c_ *>(current));                           \
     break;
 
   UNIQUE_CASE(Display)
   UNIQUE_CASE(Background)
   UNIQUE_CASE(Text)
   UNIQUE_CASE(TextReset)
 
 #undef UNIQUE_CASE
@@ -432,17 +432,17 @@ nsStyleContext::CalcStyleDifference(nsSt
   nsChangeHint maxHint = nsChangeHint(NS_STYLE_HINT_FRAMECHANGE |
       nsChangeHint_UpdateCursor);
   
 #define DO_STRUCT_DIFFERENCE(struct_)                                         \
   PR_BEGIN_MACRO                                                              \
     NS_ASSERTION(NS_IsHintSubset(nsStyle##struct_::MaxDifference(), maxHint), \
                  "Struct placed in the wrong maxHint section");               \
     const nsStyle##struct_* this##struct_ =                                   \
-        static_cast<const nsStyle##struct_*>(\
+        static_cast<const nsStyle##struct_*>(                                 \
                        PeekStyleData(eStyleStruct_##struct_));                \
     if (this##struct_) {                                                      \
       const nsStyle##struct_* other##struct_ = aOther->GetStyle##struct_();   \
       if (compare &&                                                          \
           !NS_IsHintSubset(maxHint, hint) &&                                  \
           this##struct_ != other##struct_) {                                  \
         NS_ASSERTION(NS_IsHintSubset(                                         \
              this##struct_->CalcDifference(*other##struct_),                  \
--- a/modules/libpr0n/public/ImageLogging.h
+++ b/modules/libpr0n/public/ImageLogging.h
@@ -168,33 +168,33 @@ public:
                                 GIVE_ME_MS_NOW(), from,
                                 fn.get(),
                                 msg.get()));
   }
 };
 
 #define LOG_SCOPE(l, s) \
   LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         static_cast<void *>(this), \
+                                         static_cast<void *>(this),    \
                                          NS_LITERAL_CSTRING(s))
 
 #define LOG_SCOPE_WITH_PARAM(l, s, pn, pv) \
   LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         static_cast<void *>(this), \
+                                         static_cast<void *>(this),    \
                                          NS_LITERAL_CSTRING(s),        \
                                          NS_LITERAL_CSTRING(pn), pv)
 
 #define LOG_FUNC(l, s)                  \
   LogFunc(l,                            \
-          static_cast<void *>(this), \
+          static_cast<void *>(this),    \
           NS_LITERAL_CSTRING(s))
 
 #define LOG_FUNC_WITH_PARAM(l, s, pn, pv) \
   LogFunc(l,                              \
-          static_cast<void *>(this),   \
+          static_cast<void *>(this),      \
           NS_LITERAL_CSTRING(s),          \
           NS_LITERAL_CSTRING(pn), pv)
 
 #define LOG_STATIC_FUNC(l, s)           \
   LogFunc(l,                            \
           nsnull,                       \
           NS_LITERAL_CSTRING(s))
 
@@ -203,17 +203,17 @@ public:
           nsnull,                        \
           NS_LITERAL_CSTRING(s),         \
           NS_LITERAL_CSTRING(pn), pv)
 
 
 
 #define LOG_MSG(l, s, m)                   \
   LogMessage(l,                            \
-             static_cast<void *>(this), \
+             static_cast<void *>(this),    \
              NS_LITERAL_CSTRING(s),        \
              NS_LITERAL_CSTRING(m))
 
 
 #else
 #define LOG_SCOPE(l, s)
 #define LOG_SCOPE_WITH_PARAM(l, s, pn, pv)
 #define LOG_FUNC(l, s)
--- a/xpcom/base/nsAgg.h
+++ b/xpcom/base/nsAgg.h
@@ -295,20 +295,20 @@ nsresult                                
   else
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_AGGREGATED(_class)          \
   NS_IMETHODIMP                                                             \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse                           \
                          (void *p,                                          \
                           nsCycleCollectionTraversalCallback &cb)           \
   {                                                                         \
-    nsISupports *s = static_cast<nsISupports*>(p);                       \
+    nsISupports *s = static_cast<nsISupports*>(p);                          \
     NS_ASSERTION(CheckForRightISupports(s),                                 \
                  "not the nsISupports pointer we expect");                  \
-    _class *tmp = static_cast<_class*>(Downcast(s));                     \
+    _class *tmp = static_cast<_class*>(Downcast(s));                        \
     if (!tmp->IsPartOfAggregated())                                         \
         NS_IMPL_CYCLE_COLLECTION_DESCRIBE(_class)
 
 #define NS_GENERIC_AGGREGATED_CONSTRUCTOR(_InstanceClass)                   \
 static NS_METHOD                                                            \
 _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID,             \
                             void **aResult)                                 \
 {                                                                           \
--- a/xpcom/base/nsCycleCollectionParticipant.h
+++ b/xpcom/base/nsCycleCollectionParticipant.h
@@ -179,29 +179,29 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCyc
 ///////////////////////////////////////////////////////////////////////////////
 // Helpers for implementing nsCycleCollectionParticipant::Unlink
 ///////////////////////////////////////////////////////////////////////////////
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class)                          \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    nsISupports *s = static_cast<nsISupports*>(p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                             \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
     _class *tmp = Downcast(s);
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(_class, _base_class)   \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    nsISupports *s = static_cast<nsISupports*>(p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                             \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
-    _class *tmp = static_cast<_class*>(Downcast(s));                        \
+    _class *tmp = static_cast<_class*>(Downcast(s));                           \
     NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Unlink(s);
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_NATIVE(_class)                   \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
     _class *tmp = static_cast<_class*>(p);
 
@@ -217,17 +217,17 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCyc
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_END                                    \
     return NS_OK;                                                              \
   }
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_0(_class)                              \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    NS_ASSERTION(CheckForRightISupports(static_cast<nsISupports*>(p)),      \
+    NS_ASSERTION(CheckForRightISupports(static_cast<nsISupports*>(p)),         \
                  "not the nsISupports pointer we expect");                     \
     return NS_OK;                                                              \
   }
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(_class)                       \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
@@ -248,41 +248,41 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCyc
 #endif
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class)                        \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse                              \
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    nsISupports *s = static_cast<nsISupports*>(p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                             \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
     _class *tmp = Downcast(s);                                                 \
     NS_IMPL_CYCLE_COLLECTION_DESCRIBE(_class)
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(_class, _base_class) \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse                              \
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    nsISupports *s = static_cast<nsISupports*>(p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                             \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
-    _class *tmp = static_cast<_class*>(Downcast(s));                        \
+    _class *tmp = static_cast<_class*>(Downcast(s));                           \
     NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Traverse(s, cb);
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(_class)                 \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Traverse                              \
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    _class *tmp = static_cast<_class*>(p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                     \
     NS_IMPL_CYCLE_COLLECTION_DESCRIBE(_class)
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(_field)                       \
     cb.NoteXPCOMChild(tmp->_field);
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(_field)                     \
     cb.NoteXPCOMChild(tmp->_field.get());
 
@@ -331,17 +331,17 @@ public:                                 
   NS_IMETHOD Traverse(void *p,                                                 \
                       nsCycleCollectionTraversalCallback &cb);                 \
   NS_IMETHOD_(void) UnmarkPurple(nsISupports *s)                               \
   {                                                                            \
     Downcast(s)->UnmarkPurple();                                               \
   }                                                                            \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return static_cast<_class*>(static_cast<_base*>(s));                 \
+    return static_cast<_class*>(static_cast<_base*>(s));                       \
   }                                                                            \
   static nsISupports* Upcast(_class *p)                                        \
   {                                                                            \
     return NS_ISUPPORTS_CAST(_base*, p);                                       \
   }                                                                            \
 };                                                           
 
 #define NS_DECL_CYCLE_COLLECTION_CLASS(_class)                                 \
@@ -352,32 +352,32 @@ class NS_CYCLE_COLLECTION_INNERCLASS    
  : public NS_CYCLE_COLLECTION_CLASSNAME(_base_class)                           \
 {                                                                              \
 public:                                                                        \
   NS_IMETHOD Unlink(void *p);                                                  \
   NS_IMETHOD Traverse(void *p,                                                 \
                       nsCycleCollectionTraversalCallback &cb);                 \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return static_cast<_class*>(static_cast<_base_class*>(\
+    return static_cast<_class*>(static_cast<_base_class*>(                     \
       NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Downcast(s)));               \
   }                                                                            \
 };
 
 #define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(_class,             \
                                                            _base_class)        \
 class NS_CYCLE_COLLECTION_INNERCLASS                                           \
  : public NS_CYCLE_COLLECTION_CLASSNAME(_base_class)                           \
 {                                                                              \
 public:                                                                        \
   NS_IMETHOD Traverse(void *p,                                                 \
                       nsCycleCollectionTraversalCallback &cb);                 \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return static_cast<_class*>(static_cast<_base_class*>(\
+    return static_cast<_class*>(static_cast<_base_class*>(                     \
       NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Downcast(s)));               \
   }                                                                            \
 };
 
 /**
  * This implements a stub UnmarkPurple function for classes that want to be
  * traversed but whose AddRef/Release functions don't add/remove them to/from
  * the purple buffer. If you're just using NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -414,26 +414,26 @@ public:                                 
 
 #define NS_IMPL_CYCLE_COLLECTION_NATIVE_CLASS(_class)                          \
   NS_CYCLE_COLLECTION_CLASSNAME(_class) NS_CYCLE_COLLECTION_NATIVE_NAME(_class);
 
 #define NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(_class, _root_function)           \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Root(void *p)                         \
   {                                                                            \
-    _class *tmp = static_cast<_class*>(p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                     \
     tmp->_root_function();                                                     \
     return NS_OK;                                                              \
   }
 
 #define NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(_class, _unroot_function)       \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unroot(void *p)                       \
   {                                                                            \
-    _class *tmp = static_cast<_class*>(p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                     \
     tmp->_unroot_function();                                                   \
     return NS_OK;                                                              \
   }
 
 #define NS_IMPL_CYCLE_COLLECTION_0(_class)                                     \
  NS_IMPL_CYCLE_COLLECTION_CLASS(_class)                                        \
  NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class)                                 \
  NS_IMPL_CYCLE_COLLECTION_UNLINK_END                                           \
--- a/xpcom/ds/nsDoubleHashtable.h
+++ b/xpcom/ds/nsDoubleHashtable.h
@@ -206,23 +206,23 @@ PR_STATIC_CALLBACK(PLDHashNumber)       
 ENTRY_CLASS##HashKey(PLDHashTable* table, const void* key)                    \
 {                                                                             \
   return ENTRY_CLASS::HashKey(key);                                           \
 }                                                                             \
 PR_STATIC_CALLBACK(PRBool)                                                    \
 ENTRY_CLASS##MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,    \
                         const void *key)                                      \
 {                                                                             \
-  const ENTRY_CLASS* e = static_cast<const ENTRY_CLASS*>(entry);           \
+  const ENTRY_CLASS* e = static_cast<const ENTRY_CLASS*>(entry);              \
   return e->MatchEntry(key);                                                  \
 }                                                                             \
 PR_STATIC_CALLBACK(void)                                                      \
 ENTRY_CLASS##ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)          \
 {                                                                             \
-  ENTRY_CLASS* e = static_cast<ENTRY_CLASS *>(entry);                      \
+  ENTRY_CLASS* e = static_cast<ENTRY_CLASS *>(entry);                         \
   e->~ENTRY_CLASS();                                                          \
 }                                                                             \
 PR_STATIC_CALLBACK(PRBool)                                                    \
 ENTRY_CLASS##InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,           \
                        const void *key)                                       \
 {                                                                             \
   new (entry) ENTRY_CLASS(key);                                               \
   return PR_TRUE;                                                             \
@@ -348,23 +348,23 @@ nsresult CLASSNAME::Init(PRUint32 aNumIn
   if (!mHashTable.ops) {                                                      \
     nsresult rv;                                                              \
     DHASH_INIT(mHashTable,ENTRY_CLASS,aNumInitialEntries,rv);                 \
     return rv;                                                                \
   }                                                                           \
   return NS_OK;                                                               \
 }                                                                             \
 ENTRY_CLASS* CLASSNAME::GetEntry(const KEY_TYPE aKey) {                       \
-  ENTRY_CLASS* e = static_cast<ENTRY_CLASS*>(\
+  ENTRY_CLASS* e = static_cast<ENTRY_CLASS*>(                                 \
                                   PL_DHashTableOperate(&mHashTable, &aKey,    \
                                                        PL_DHASH_LOOKUP));     \
   return PL_DHASH_ENTRY_IS_BUSY(e) ? e : nsnull;                              \
 }                                                                             \
 ENTRY_CLASS* CLASSNAME::AddEntry(const KEY_TYPE aKey) {                       \
-  return static_cast<ENTRY_CLASS*>(\
+  return static_cast<ENTRY_CLASS*>(                                           \
                         PL_DHashTableOperate(&mHashTable, &aKey,              \
                                              PL_DHASH_ADD));                  \
 }                                                                             \
 void CLASSNAME::Remove(const KEY_TYPE aKey) {                                 \
   PL_DHashTableOperate(&mHashTable, &aKey, PL_DHASH_REMOVE);                  \
 }
 
 /*
--- a/xpcom/glue/nsIClassInfoImpl.h
+++ b/xpcom/glue/nsIClassInfoImpl.h
@@ -47,17 +47,17 @@
 
 #define NS_DECL_CLASSINFO(_class)                                             \
   NS_DECL_CI_INTERFACE_GETTER(_class)                                         \
   nsIClassInfo *NS_CLASSINFO_NAME(_class);
 
 #define NS_IMPL_QUERY_CLASSINFO(_class)                                       \
   if ( aIID.Equals(NS_GET_IID(nsIClassInfo)) ) {                              \
     extern nsIClassInfo *NS_CLASSINFO_NAME(_class);                           \
-    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));\
+    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));   \
   } else
 
 #define NS_CLASSINFO_HELPER_BEGIN(_class, _c)                                 \
 NS_IMETHODIMP                                                                 \
 NS_CI_INTERFACE_GETTER_NAME(_class)(PRUint32 *count, nsIID ***array)          \
 {                                                                             \
     *count = _c;                                                              \
     *array = (nsIID **)nsMemory::Alloc(sizeof (nsIID *) * _c);
--- a/xpcom/glue/nsISupportsImpl.h
+++ b/xpcom/glue/nsISupportsImpl.h
@@ -433,33 +433,33 @@ NS_IMETHODIMP _class::QueryInterface(REF
                "QueryInterface requires a non-NULL destination!");            \
   nsresult rv = NS_ERROR_FAILURE;;
 
 #define NS_INTERFACE_TABLE_BEGIN                                              \
   static const QITableEntry table[] = {
 
 #define NS_INTERFACE_TABLE_ENTRY(_class, _interface)                          \
   { &_interface::COMTypeInfo<int>::kIID,                                      \
-    reinterpret_cast<char*>(\
-                        static_cast<_interface*>((_class*) 0x1000)) -      \
-    reinterpret_cast<char*>((_class*) 0x1000)                              \
+    reinterpret_cast<char*>(                                                  \
+                        static_cast<_interface*>((_class*) 0x1000)) -         \
+    reinterpret_cast<char*>((_class*) 0x1000)                                 \
   },
 
 #define NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, _interface, _implClass)    \
   { &_interface::COMTypeInfo<int>::kIID,                                      \
-    reinterpret_cast<char*>(\
-                        static_cast<_interface*>(\
-                                       static_cast<_implClass*>(\
+    reinterpret_cast<char*>(                                                  \
+                        static_cast<_interface*>(                             \
+                                       static_cast<_implClass*>(              \
                                                       (_class*) 0x1000))) -   \
-    reinterpret_cast<char*>((_class*) 0x1000)                              \
+    reinterpret_cast<char*>((_class*) 0x1000)                                 \
   },
 
 #define NS_INTERFACE_TABLE_END                                                \
   { nsnull, 0 } };                                                            \
-  rv = NS_TableDrivenQI(static_cast<void*>(this),                          \
+  rv = NS_TableDrivenQI(static_cast<void*>(this),                             \
                         table, aIID, aInstancePtr);
 
 #define NS_INTERFACE_TABLE_TAIL                                               \
   return rv;                                                                  \
 }
 
 #define NS_INTERFACE_TABLE_TAIL_INHERITING(_baseclass)                        \
   if (NS_SUCCEEDED(rv))                                                       \
@@ -489,33 +489,33 @@ NS_IMETHODIMP _class::QueryInterface(REF
 NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
 {                                                                             \
   NS_ASSERTION(aInstancePtr,                                                  \
                "QueryInterface requires a non-NULL destination!");            \
   nsISupports* foundInterface;
 
 #define NS_IMPL_QUERY_BODY(_interface)                                        \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = static_cast<_interface*>(this);                       \
+    foundInterface = static_cast<_interface*>(this);                          \
   else
 
 #define NS_IMPL_QUERY_BODY_CONDITIONAL(_interface, condition)                 \
   if ( (condition) && aIID.Equals(NS_GET_IID(_interface)))                    \
-    foundInterface = static_cast<_interface*>(this);                       \
+    foundInterface = static_cast<_interface*>(this);                          \
   else
 
 #define NS_IMPL_QUERY_BODY_AMBIGUOUS(_interface, _implClass)                  \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = static_cast<_interface*>(\
-                                    static_cast<_implClass*>(this));       \
+    foundInterface = static_cast<_interface*>(                                \
+                                    static_cast<_implClass*>(this));          \
   else
 
 #define NS_IMPL_QUERY_BODY_AGGREGATED(_interface, _aggregate)                 \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = static_cast<_interface*>(_aggregate);                 \
+    foundInterface = static_cast<_interface*>(_aggregate);                    \
   else
 
 #define NS_IMPL_QUERY_TAIL_GUTS                                               \
     foundInterface = 0;                                                       \
   nsresult status;                                                            \
   if ( !foundInterface )                                                      \
     status = NS_NOINTERFACE;                                                  \
   else                                                                        \
@@ -1122,17 +1122,17 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release
 
 #define NS_DECL_CLASSINFO(_class)                                             \
   NS_DECL_CI_INTERFACE_GETTER(_class)                                         \
   nsIClassInfo *NS_CLASSINFO_NAME(_class);
 
 #define NS_IMPL_QUERY_CLASSINFO(_class)                                       \
   if ( aIID.Equals(NS_GET_IID(nsIClassInfo)) ) {                              \
     extern nsIClassInfo *NS_CLASSINFO_NAME(_class);                           \
-    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));\
+    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));   \
   } else
 
 #define NS_CLASSINFO_HELPER_BEGIN(_class, _c)                                 \
 NS_IMETHODIMP                                                                 \
 NS_CI_INTERFACE_GETTER_NAME(_class)(PRUint32 *count, nsIID ***array)          \
 {                                                                             \
     *count = _c;                                                              \
     *array = (nsIID **)nsMemory::Alloc(sizeof (nsIID *) * _c);
--- a/xpcom/string/src/nsSubstringTuple.cpp
+++ b/xpcom/string/src/nsSubstringTuple.cpp
@@ -37,17 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsSubstringTuple.h"
 
 #if 0
   // convert fragment to |const string_base_type&|
 #define TO_SUBSTRING(_v)                                        \
     ( (ptrdiff_t(_v) & 0x1)                                     \
-        ? reinterpret_cast<const abstract_string_type*>(\
+        ? reinterpret_cast<const abstract_string_type*>(        \
             ((unsigned long)_v & ~0x1))->ToSubstring()          \
         : *reinterpret_cast<const substring_type*>((_v)) )
 #endif
 
   // convert fragment to |const substring_type&|
 #ifdef MOZ_V1_STRING_ABI
 #define TO_SUBSTRING(_v)                                        \
     ( (_v)->mVTable == obsolete_string_type::sCanonicalVTable   \