Bug 1167306 - Fix preprocessor goof that disabled the load manager and some preference handling. r=jesup, a=sledru
authorByron Campen [:bwc] <docfaraday@gmail.com>
Thu, 21 May 2015 13:45:55 -0700
changeset 274760 f13fdaa24c37648aee7bc65e1faa96e635a74ffa
parent 274759 c0a779c57c3ae49ebb1d11b3e1600f1c967ed714
child 274761 032f91456953f64a276c6b48d87a669bb268b37c
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1167306
milestone40.0a2
Bug 1167306 - Fix preprocessor goof that disabled the load manager and some preference handling. r=jesup, a=sledru
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -273,17 +273,17 @@ bool WebrtcVideoConduit::GetRTCPSenderRe
 /**
  * Performs initialization of the MANDATORY components of the Video Engine
  */
 MediaConduitErrorCode
 WebrtcVideoConduit::Init()
 {
   CSFLogDebug(logTag,  "%s this=%p", __FUNCTION__, this);
 
-#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_INTERNAL_API)
+#if defined(MOZILLA_INTERNAL_API) && !defined(MOZILLA_XPCOMRT_API)
   // already know we must be on MainThread barring unit test weirdness
   MOZ_ASSERT(NS_IsMainThread());
 
   nsresult rv;
   nsCOMPtr<nsIPrefService> prefs = do_GetService("@mozilla.org/preferences-service;1", &rv);
   if (!NS_WARN_IF(NS_FAILED(rv)))
   {
     nsCOMPtr<nsIPrefBranch> branch = do_QueryInterface(prefs);