From c47a83ce36d1823ddc8b05993dbcc9b1b1a09768 Mon Sep 17 00:00:00 2001
From: Eric Rahm <erahm@mozilla.com>
Date: Sat, 27 Feb 2016 11:12:07 -0800
Subject: [PATCH] Bug 1251769 - Remove remaining references to
 MOZILLA_XPCOMRT_API from mfbt. r=froydnj

---
 mfbt/Assertions.h | 4 ++--
 mfbt/RefCounted.h | 1 -
 mfbt/Types.h      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h
index d724191ba3cc..83caf96adc3e 100644
--- a/mfbt/Assertions.h
+++ b/mfbt/Assertions.h
@@ -158,7 +158,7 @@ MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename, int aLine)
                       aStr, aFilename, aLine);
 #else
   fprintf(stderr, "Assertion failure: %s, at %s:%d\n", aStr, aFilename, aLine);
-#if defined (MOZ_DUMP_ASSERTION_STACK) && !defined(MOZILLA_XPCOMRT_API)
+#if defined (MOZ_DUMP_ASSERTION_STACK)
   nsTraceRefcnt::WalkTheStack(stderr);
 #endif
   fflush(stderr);
@@ -174,7 +174,7 @@ MOZ_ReportCrash(const char* aStr, const char* aFilename, int aLine)
                       "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
 #else
   fprintf(stderr, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
-#if defined(MOZ_DUMP_ASSERTION_STACK) && !defined(MOZILLA_XPCOMRT_API)
+#if defined(MOZ_DUMP_ASSERTION_STACK)
   nsTraceRefcnt::WalkTheStack(stderr);
 #endif
   fflush(stderr);
diff --git a/mfbt/RefCounted.h b/mfbt/RefCounted.h
index 873e40ea6a9e..ae05f1e0f3e7 100644
--- a/mfbt/RefCounted.h
+++ b/mfbt/RefCounted.h
@@ -22,7 +22,6 @@
 #endif
 
 #if defined(MOZILLA_INTERNAL_API) && \
-    !defined(MOZILLA_XPCOMRT_API) && \
     (defined(DEBUG) || defined(FORCE_BUILD_REFCNT_LOGGING))
 #define MOZ_REFCOUNTED_LEAK_CHECKING
 #endif
diff --git a/mfbt/Types.h b/mfbt/Types.h
index a5d936389d99..e7e18abb2746 100644
--- a/mfbt/Types.h
+++ b/mfbt/Types.h
@@ -89,7 +89,7 @@
    * symbols. We add the weak attribute to the import version of the MFBT API
    * macros to exploit this.
    */
-#  if defined(MOZ_GLUE_IN_PROGRAM) && !defined(MOZILLA_XPCOMRT_API)
+#  if defined(MOZ_GLUE_IN_PROGRAM)
 #    define MFBT_API   __attribute__((weak)) MOZ_IMPORT_API
 #    define MFBT_DATA  __attribute__((weak)) MOZ_IMPORT_DATA
 #  else