wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1022764: Add #ifdef guards around some WebRTC-specific code in MediaManager.cpp. r=jesup

Browse Source
This commit is contained in:
Daniel Holbert 2014-06-09 11:45:14 -07:00
parent 4a1db8737c
commit 1738e57654
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/MediaManager.cpp
View File

@ -45,14 +45,13 @@
#include "MediaEngineDefault.h"
#if defined(MOZ_WEBRTC)
#include "MediaEngineWebRTC.h"
#include "browser_logging/WebRtcLog.h"
#endif
#ifdef MOZ_B2G
#include "MediaPermissionGonk.h"
#endif
#include "browser_logging/WebRtcLog.h"
// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
// GetTickCount() and conflicts with MediaStream::GetCurrentTime.
#ifdef GetCurrentTime
@ -1577,7 +1576,9 @@ MediaManager::GetUserMedia(bool aPrivileged,
obs->NotifyObservers(req, "getUserMedia:request", nullptr);
}
#ifdef MOZ_WEBRTC
EnableWebRtcLog();
#endif
return NS_OK;
}