Bug 1275541 - undefine GetCurrentTime; r?jesup draft
authorKaku Kuo <tkuo@mozilla.com>
Wed, 25 May 2016 20:12:27 +0800
changeset 370808 f5fc334327f9b841f9fed50c4eb8ed6a86711d6a
parent 370285 829d3be6ba648b838ee1953fdfa1a477dace752f
child 521838 aa440425b24460c2b57a60876f1c272a28af97ca
push id19156
push usertkuo@mozilla.com
push dateWed, 25 May 2016 12:16:56 +0000
reviewersjesup
bugs1275541
milestone49.0a1
Bug 1275541 - undefine GetCurrentTime; r?jesup MozReview-Commit-ID: 3LSadqoMKD3
dom/media/MediaStreamGraph.h
--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@@ -515,16 +515,23 @@ struct TrackBound
  * the DOM wrappers must keep upstream MediaStreams alive as long as they
  * could be being used in the media graph.
  *
  * At any time, however, a set of MediaStream wrappers could be
  * collected via cycle collection. Destroy messages will be sent
  * for those objects in arbitrary order and the MediaStreamGraph has to be able
  * to handle this.
  */
+
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with MediaStream::GetCurrentTime.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 class MediaStream : public mozilla::LinkedListElement<MediaStream>
 {
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaStream)
 
   explicit MediaStream(DOMMediaStream* aWrapper);
 
 protected: