From 359334f1a1d74e346ff76f8da85c8de897ca159a Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 11 Nov 2019 00:27:30 -0500
Subject: Bug 1020971 - Port bug 1015664: Remove NS_HIDDEN and friends.

Tag #1273
---
 mailnews/base/util/nsMsgDBFolder.h       | 6 ------
 mailnews/base/util/nsMsgIncomingServer.h | 6 ------
 mailnews/base/util/nsMsgMailNewsUrl.h    | 6 ------
 mailnews/base/util/nsMsgProtocol.h       | 6 ------
 mailnews/base/util/nsMsgTxn.h            | 6 ------
 mailnews/base/util/nsStopwatch.h         | 3 ---
 6 files changed, 33 deletions(-)

diff --git a/mailnews/base/util/nsMsgDBFolder.h b/mailnews/base/util/nsMsgDBFolder.h
index 6074b45f9..0c96ee8f0 100644
--- a/mailnews/base/util/nsMsgDBFolder.h
+++ b/mailnews/base/util/nsMsgDBFolder.h
@@ -40,9 +40,6 @@ class nsMsgKeySetU;
   * class derived from nsMsgFolder for those folders that use an nsIMsgDatabase
   */ 
 
-#undef IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 class NS_MSG_BASE nsMsgDBFolder: public nsRDFResource,
                                  public nsSupportsWeakReference,
                                  public nsIMsgFolder,
@@ -291,7 +288,4 @@ protected:
   nsMsgKeySet* hiKeySet;
 };
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
-
 #endif
diff --git a/mailnews/base/util/nsMsgIncomingServer.h b/mailnews/base/util/nsMsgIncomingServer.h
index d19bdc930..58502e224 100644
--- a/mailnews/base/util/nsMsgIncomingServer.h
+++ b/mailnews/base/util/nsMsgIncomingServer.h
@@ -33,9 +33,6 @@ class nsIMsgProtocolInfo;
  * this particular implementation is not meant to be used directly.
  */
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 class NS_MSG_BASE nsMsgIncomingServer : public nsIMsgIncomingServer,
                                         public nsSupportsWeakReference,
                                         public nsIObserver
@@ -101,7 +98,4 @@ protected:
   bool mPerformingBiff;
 };
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
-
 #endif // nsMsgIncomingServer_h__
diff --git a/mailnews/base/util/nsMsgMailNewsUrl.h b/mailnews/base/util/nsMsgMailNewsUrl.h
index 61fd4827e..3cd3b2ef2 100644
--- a/mailnews/base/util/nsMsgMailNewsUrl.h
+++ b/mailnews/base/util/nsMsgMailNewsUrl.h
@@ -34,9 +34,6 @@
 //
 //////////////////////////////////////////////////////////////////////////////////
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 class NS_MSG_BASE nsMsgMailNewsUrl : public nsIMsgMailNewsUrl,
                                      public nsIURIWithPrincipal
 {
@@ -80,7 +77,4 @@ protected:
   nsTObserverArray<nsCOMPtr<nsIUrlListener> > mUrlListeners;
 };
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
-
 #endif /* nsMsgMailNewsUrl_h___ */
diff --git a/mailnews/base/util/nsMsgProtocol.h b/mailnews/base/util/nsMsgProtocol.h
index 98aa67285..f0675d6ff 100644
--- a/mailnews/base/util/nsMsgProtocol.h
+++ b/mailnews/base/util/nsMsgProtocol.h
@@ -31,9 +31,6 @@ class nsIMsgMailNewsUrl;
 class nsMsgFilePostHelper;
 class nsIProxyInfo;
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 // This is a helper class used to encapsulate code shared between all of the
 // mailnews protocol objects (imap, news, pop, smtp, etc.) In particular,
 // it unifies the core networking code for the protocols. My hope is that
@@ -233,7 +230,4 @@ protected:
   virtual nsresult CloseSocket() override; 
 };
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
-
 #endif /* nsMsgProtocol_h__ */
diff --git a/mailnews/base/util/nsMsgTxn.h b/mailnews/base/util/nsMsgTxn.h
index 5c34de4d4..e925b60ea 100644
--- a/mailnews/base/util/nsMsgTxn.h
+++ b/mailnews/base/util/nsMsgTxn.h
@@ -25,9 +25,6 @@
  * base class for all message undo/redo transactions.
  */
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 class NS_MSG_BASE nsMsgTxn : public nsITransaction, 
                              public nsIWritablePropertyBag,
                              public nsIWritablePropertyBag2
@@ -67,7 +64,4 @@ protected:
     nsresult CheckForToggleDelete(nsIMsgFolder *aFolder, const nsMsgKey &aMsgKey, bool *aResult);
 };
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_HIDDEN
-
 #endif
diff --git a/mailnews/base/util/nsStopwatch.h b/mailnews/base/util/nsStopwatch.h
index 62b1c52b8..108518870 100644
--- a/mailnews/base/util/nsStopwatch.h
+++ b/mailnews/base/util/nsStopwatch.h
@@ -14,9 +14,6 @@
 
 #define NS_STOPWATCH_CONTRACTID "@mozilla.org/stopwatch;1"
 
-#undef  IMETHOD_VISIBILITY
-#define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT
-
 class NS_MSG_BASE nsStopwatch : public nsIStopwatch
 {
 public:
-- 
cgit v1.2.3