Bug 984443 - get rid of #ifndef $OTHER_HEADER bits from xpcom/ as relics of a bygone era; r=ehsan

xpcom/base/nsAutoPtr.h

@@ -6,13 +6,7 @@
 #ifndef nsAutoPtr_h___
 #define nsAutoPtr_h___
 
-  // Wrapping includes can speed up compiles (see "Large Scale C++ Software Design")
-#ifndef nsCOMPtr_h___
-  // For |already_AddRefed|, |NSCAP_Zero|,
-  // |NSCAP_DONT_PROVIDE_NONCONST_OPEQ|,
-  // |NSCAP_FEATURE_INLINE_STARTASSIGNMENT|
 #include "nsCOMPtr.h"
-#endif
 
 #include "nsCycleCollectionNoteChild.h"
 #include "mozilla/MemoryReporting.h"

xpcom/glue/nsCOMPtr.h

@@ -25,21 +25,9 @@
 #include "mozilla/NullPtr.h"
 #include "mozilla/Move.h"
 
-  // Wrapping includes can speed up compiles (see "Large Scale C++ Software Design")
-#ifndef nsDebug_h___
-#include "nsDebug.h"
-  // for |NS_ABORT_IF_FALSE|, |NS_ASSERTION|
-#endif
-
-#ifndef nsISupportsUtils_h__
-#include "nsISupportsUtils.h"
-  // for |nsresult|, |NS_ADDREF|, |NS_GET_TEMPLATE_IID| et al
-#endif
-
-#ifndef nscore_h___
-#include "nscore.h"
-  // for |NS_COM_GLUE|
-#endif
+#include "nsDebug.h" // for |NS_ABORT_IF_FALSE|, |NS_ASSERTION|
+#include "nsISupportsUtils.h" // for |nsresult|, |NS_ADDREF|, |NS_GET_TEMPLATE_IID| et al
+#include "nscore.h" // for |NS_COM_GLUE|
 
 #include "nsCycleCollectionNoteChild.h"
 

xpcom/glue/nsComponentManagerUtils.h

@@ -6,13 +6,8 @@
 #ifndef nsComponentManagerUtils_h__
 #define nsComponentManagerUtils_h__
 
-#ifndef nscore_h__
 #include "nscore.h"
-#endif
-
-#ifndef nsCOMPtr_h__
 #include "nsCOMPtr.h"
-#endif
 
 #include "nsIFactory.h"
 

xpcom/glue/nsDebug.h

@@ -6,13 +6,8 @@
 #ifndef nsDebug_h___
 #define nsDebug_h___
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
-
-#ifndef nsError_h__
 #include "nsError.h"
-#endif
 
 #include "nsXPCOM.h"
 #include "mozilla/Assertions.h"

xpcom/glue/nsID.h

@@ -8,9 +8,7 @@
 
 #include <string.h>
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
 
 #define NSID_LENGTH 39
 

xpcom/glue/nsISupportsImpl.h

@@ -8,17 +8,9 @@
 #ifndef nsISupportsImpl_h__
 #define nsISupportsImpl_h__
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
-
-#ifndef nsISupportsBase_h__
 #include "nsISupportsBase.h"
-#endif
-
-#ifndef nsISupportsUtils_h__
 #include "nsISupportsUtils.h"
-#endif
 
 
 #if !defined(XPCOM_GLUE_AVOID_NSPR)

xpcom/glue/nsISupportsUtils.h

@@ -6,25 +6,11 @@
 #ifndef nsISupportsUtils_h__
 #define nsISupportsUtils_h__
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
-
-#ifndef nsISupportsBase_h__
 #include "nsISupportsBase.h"
-#endif
-
-#ifndef nsError_h__
 #include "nsError.h"
-#endif
-
-#ifndef nsDebug_h___
 #include "nsDebug.h"
-#endif
-
-#ifndef nsISupportsImpl_h__
 #include "nsISupportsImpl.h"
-#endif
 
 /**
  * Macro for adding a reference to an interface.

xpcom/glue/nsIWeakReferenceUtils.h

@@ -6,10 +6,7 @@
 #ifndef nsIWeakReferenceUtils_h__
 #define nsIWeakReferenceUtils_h__
 
-#ifndef nsCOMPtr_h__
 #include "nsCOMPtr.h"
-#endif
-
 #include "nsIWeakReference.h"
 
 typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;

xpcom/string/public/nsAString.h

@@ -8,13 +8,8 @@
 #ifndef nsAString_h___
 #define nsAString_h___
 
-#ifndef nsStringFwd_h___
 #include "nsStringFwd.h"
-#endif
-
-#ifndef nsStringIterator_h___
 #include "nsStringIterator.h"
-#endif
 
 #include <string.h>
 #include <stdarg.h>

xpcom/string/public/nsAlgorithm.h

@@ -6,10 +6,7 @@
 #ifndef nsAlgorithm_h___
 #define nsAlgorithm_h___
 
-#ifndef nsCharTraits_h___
-#include "nsCharTraits.h"
-  // for |nsCharSourceTraits|, |nsCharSinkTraits|
-#endif
+#include "nsCharTraits.h"  // for |nsCharSourceTraits|, |nsCharSinkTraits|
 
 template <class T>
 inline

xpcom/string/public/nsCharTraits.h

@@ -6,16 +6,10 @@
 #ifndef nsCharTraits_h___
 #define nsCharTraits_h___
 
-#include <ctype.h>
-  // for |EOF|, |WEOF|
+#include <ctype.h> // for |EOF|, |WEOF|
+#include <string.h> // for |memcpy|, et al
 
-#include <string.h>
-  // for |memcpy|, et al
-
-#ifndef nscore_h___
-#include "nscore.h"
-  // for |char16_t|
-#endif
+#include "nscore.h" // for |char16_t|
 
 // This file may be used (through nsUTF8Utils.h) from non-XPCOM code, in
 // particular the standalone software updater. In that case stub out
@@ -26,10 +20,7 @@
 #define NS_ASSERTION(cond, msg)
 #define NS_ERROR(msg)
 #else
-#ifndef nsDebug_h__
-#include "nsDebug.h"
-  // for NS_ASSERTION
-#endif
+#include "nsDebug.h"  // for NS_ASSERTION
 #endif
 
 /*

xpcom/string/public/nsDependentString.h

@@ -7,13 +7,8 @@
 #ifndef nsDependentString_h___
 #define nsDependentString_h___
 
-#ifndef nsString_h___
 #include "nsString.h"
-#endif
-
-#ifndef nsDebug_h___
 #include "nsDebug.h"
-#endif
 
   // declare nsDependentString
 #include "string-template-def-unichar.h"

xpcom/string/public/nsDependentSubstring.h

@@ -7,9 +7,7 @@
 #ifndef nsDependentSubstring_h___
 #define nsDependentSubstring_h___
 
-#ifndef nsSubstring_h___
 #include "nsSubstring.h"
-#endif
 
   // declare nsDependentSubstring
 #include "string-template-def-unichar.h"

xpcom/string/public/nsLiteralString.h

@@ -6,13 +6,8 @@
 #ifndef nsLiteralString_h___
 #define nsLiteralString_h___
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
-
-#ifndef nsString_h___
 #include "nsString.h"
-#endif
 
   // declare nsLiteralString
 #include "string-template-def-unichar.h"

xpcom/string/public/nsPrintfCString.h

@@ -6,9 +6,7 @@
 #ifndef nsPrintfCString_h___
 #define nsPrintfCString_h___
  
-#ifndef nsString_h___
 #include "nsString.h"
-#endif
 
 /**
  * nsPrintfCString lets you create a nsCString using a printf-style format

xpcom/string/public/nsPromiseFlatString.h

@@ -7,9 +7,7 @@
 #ifndef nsPromiseFlatString_h___
 #define nsPromiseFlatString_h___
 
-#ifndef nsString_h___
 #include "nsString.h"
-#endif
 
   // declare nsPromiseFlatString
 #include "string-template-def-unichar.h"

xpcom/string/public/nsReadableUtils.h

@@ -12,9 +12,7 @@
    * According to our conventions, they should be |NS_xxx|.
    */
 
-#ifndef nsAString_h___
 #include "nsAString.h"
-#endif
 
 #include "nsTArrayForwardDeclare.h"
 

xpcom/string/public/nsString.h

@@ -9,17 +9,9 @@
 
 #include "mozilla/Attributes.h"
 
-#ifndef nsSubstring_h___
 #include "nsSubstring.h"
-#endif
-
-#ifndef nsDependentSubstring_h___
 #include "nsDependentSubstring.h"
-#endif
-
-#ifndef nsReadableUtils_h___
 #include "nsReadableUtils.h"
-#endif
 
 #include <new>
 
@@ -210,17 +202,9 @@ wwc(char16_t *str)
 // the following are included/declared for backwards compatibility
 typedef nsAutoString nsVoidableString;
 
-#ifndef nsDependentString_h___
 #include "nsDependentString.h"
-#endif
-
-#ifndef nsLiteralString_h___
 #include "nsLiteralString.h"
-#endif
-
-#ifndef nsPromiseFlatString_h___
 #include "nsPromiseFlatString.h"
-#endif
 
 // need to include these for backwards compatibility
 #include "nsMemory.h"

xpcom/string/public/nsStringFwd.h

@@ -8,9 +8,7 @@
 #ifndef nsStringFwd_h___
 #define nsStringFwd_h___
 
-#ifndef nscore_h___
 #include "nscore.h"
-#endif
 
 #ifndef MOZILLA_INTERNAL_API
 #error Internal string headers are not available from external-linkage code.

xpcom/string/public/nsStringIterator.h

@@ -6,17 +6,9 @@
 #ifndef nsStringIterator_h___
 #define nsStringIterator_h___
 
-#ifndef nsCharTraits_h___
 #include "nsCharTraits.h"
-#endif
-
-#ifndef nsAlgorithm_h___
 #include "nsAlgorithm.h"
-#endif
-
-#ifndef nsDebug_h___
 #include "nsDebug.h"
-#endif
 
   /**
    * @see nsTAString

xpcom/string/public/nsSubstring.h

@@ -7,8 +7,6 @@
 #ifndef nsSubstring_h___
 #define nsSubstring_h___
 
-#ifndef nsAString_h___
 #include "nsAString.h"
-#endif
 
 #endif // !defined(nsSubstring_h___)

xpcom/string/public/nsSubstringTuple.h

@@ -7,9 +7,7 @@
 #ifndef nsSubstringTuple_h___
 #define nsSubstringTuple_h___
 
-#ifndef nsSubstring_h___
 #include "nsSubstring.h"
-#endif
 
   // declare nsSubstringTuple
 #include "string-template-def-unichar.h"

xpcom/string/public/nsXPIDLString.h

@@ -7,8 +7,6 @@
 #ifndef nsXPIDLString_h___
 #define nsXPIDLString_h___
 
-#ifndef nsString_h___
 #include "nsString.h"
-#endif
 
 #endif /* !defined(nsXPIDLString_h___) */