From 524406b7fd71410eda1610fcf42f979052c2a51c Mon Sep 17 00:00:00 2001
From: "dbaron%fas.harvard.edu"
 <dbaron%fas.harvard.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 25 Jul 2001 05:16:32 +0000
Subject: [PATCH] Remove |#ifdef|s around |#include|s since they're a recipe
 for build bustage (see the portability guidelines).  b=91237  r=jag 
 sr=waterson

git-svn-id: svn://10.0.0.236/trunk@99888 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsCopySupport.cpp        | 8 +++++---
 mozilla/content/base/src/nsSelection.cpp          | 3 +--
 mozilla/editor/base/nsTextEditRules.cpp           | 4 ++--
 mozilla/editor/libeditor/text/nsTextEditRules.cpp | 4 ++--
 mozilla/layout/base/src/nsCopySupport.cpp         | 8 +++++---
 mozilla/layout/generic/nsSelection.cpp            | 3 +--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/mozilla/content/base/src/nsCopySupport.cpp b/mozilla/content/base/src/nsCopySupport.cpp
index f45fa4d24a5..f5a14edbb33 100644
--- a/mozilla/content/base/src/nsCopySupport.cpp
+++ b/mozilla/content/base/src/nsCopySupport.cpp
@@ -33,15 +33,17 @@
 #include "nsIDOMNSHTMLInputElement.h"
 #include "nsIDOMNSHTMLTextAreaElement.h"
 #include "nsISupportsPrimitives.h"
-#ifdef IBMBIDI
-#include "nsIUBidiUtils.h"
+#include "nsIDOMRange.h"
+
+// for IBMBIDI
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
-#include "nsIDOMRange.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIHTMLDocument.h"
 #include "nsHTMLAtoms.h"
+#ifdef IBMBIDI
+#include "nsIUBidiUtils.h"
 static NS_DEFINE_CID(kUBidiUtilCID, NS_UNICHARBIDIUTIL_CID);
 #endif
 
diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp
index 05ea625ec2c..ea94e482925 100644
--- a/mozilla/content/base/src/nsSelection.cpp
+++ b/mozilla/content/base/src/nsSelection.cpp
@@ -53,14 +53,13 @@
 #include "nsIIndependentSelection.h"
 #include "nsIPref.h"
 
-#ifdef IBMBIDI
+// for IBMBIDI
 #include "nsFrameTraversal.h"
 #include "nsILineIterator.h"
 #include "nsLayoutAtoms.h"
 #include "nsIFrameTraversal.h"
 #include "nsLayoutCID.h"
 static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
-#endif // IBMBIDI
 
 #include "nsIDOMText.h"
 
diff --git a/mozilla/editor/base/nsTextEditRules.cpp b/mozilla/editor/base/nsTextEditRules.cpp
index f695bbb7925..d09ab2070ea 100644
--- a/mozilla/editor/base/nsTextEditRules.cpp
+++ b/mozilla/editor/base/nsTextEditRules.cpp
@@ -41,10 +41,10 @@
 #include "nsEditorUtils.h"
 #include "EditTxn.h"
 #include "nsIPref.h"
-#ifdef IBMBIDI
+
+// for IBMBIDI
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
-#endif // IBMBIDI
 
 static NS_DEFINE_CID(kContentIteratorCID,   NS_CONTENTITERATOR_CID);
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
index f695bbb7925..d09ab2070ea 100644
--- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp
+++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
@@ -41,10 +41,10 @@
 #include "nsEditorUtils.h"
 #include "EditTxn.h"
 #include "nsIPref.h"
-#ifdef IBMBIDI
+
+// for IBMBIDI
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
-#endif // IBMBIDI
 
 static NS_DEFINE_CID(kContentIteratorCID,   NS_CONTENTITERATOR_CID);
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
diff --git a/mozilla/layout/base/src/nsCopySupport.cpp b/mozilla/layout/base/src/nsCopySupport.cpp
index f45fa4d24a5..f5a14edbb33 100644
--- a/mozilla/layout/base/src/nsCopySupport.cpp
+++ b/mozilla/layout/base/src/nsCopySupport.cpp
@@ -33,15 +33,17 @@
 #include "nsIDOMNSHTMLInputElement.h"
 #include "nsIDOMNSHTMLTextAreaElement.h"
 #include "nsISupportsPrimitives.h"
-#ifdef IBMBIDI
-#include "nsIUBidiUtils.h"
+#include "nsIDOMRange.h"
+
+// for IBMBIDI
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
-#include "nsIDOMRange.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIHTMLDocument.h"
 #include "nsHTMLAtoms.h"
+#ifdef IBMBIDI
+#include "nsIUBidiUtils.h"
 static NS_DEFINE_CID(kUBidiUtilCID, NS_UNICHARBIDIUTIL_CID);
 #endif
 
diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp
index 05ea625ec2c..ea94e482925 100644
--- a/mozilla/layout/generic/nsSelection.cpp
+++ b/mozilla/layout/generic/nsSelection.cpp
@@ -53,14 +53,13 @@
 #include "nsIIndependentSelection.h"
 #include "nsIPref.h"
 
-#ifdef IBMBIDI
+// for IBMBIDI
 #include "nsFrameTraversal.h"
 #include "nsILineIterator.h"
 #include "nsLayoutAtoms.h"
 #include "nsIFrameTraversal.h"
 #include "nsLayoutCID.h"
 static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
-#endif // IBMBIDI
 
 #include "nsIDOMText.h"