Bug 1256626. Workaround Microsoft macro silliness. r=me a=ritu
authorJean-Yves Avenard <jyavenard@mozilla.com>
Sat, 19 Mar 2016 13:21:23 +1100
changeset 323729 d549d9ad9c14611fb7c33acb691194e873d7b805
parent 323728 f95d91b89e35f199a0fcbff86a8c5cf7ef12f0f3
child 323730 9985cfb9f7aee2fecbe79273afab51649435e8b8
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, ritu
bugs1256626
milestone47.0a2
Bug 1256626. Workaround Microsoft macro silliness. r=me a=ritu Unrelated to changes to 1256626, but obviously broke the unified build system ON A CLOSED TREE. MozReview-Commit-ID: 3vklyHWFtgp
dom/media/DOMMediaStream.cpp
--- a/dom/media/DOMMediaStream.cpp
+++ b/dom/media/DOMMediaStream.cpp
@@ -20,16 +20,23 @@
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/MediaStreamError.h"
 #include "mozilla/dom/Promise.h"
 #include "MediaStreamGraph.h"
 #include "AudioStreamTrack.h"
 #include "VideoStreamTrack.h"
 #include "Layers.h"
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with NS_DECL_NSIDOMMEDIASTREAM, containing
+// currentTime getter.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 #ifdef LOG
 #undef LOG
 #endif
 
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;