Bug 472799 - Undefine GetCurrentTime in nsDOMMediaStream.h r=cpearce
authorJacek Caban <jacek@codeweavers.com>
Thu, 19 Jul 2012 11:58:48 +0200
changeset 99781 743be252e631
parent 99780 8adec1d5233c
child 99782 bfdfb713816e
push id23151
push useremorley@mozilla.com
push date2012-07-20 13:33 +0000
treeherdermozilla-central@3337f0685b75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs472799
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 472799 - Undefine GetCurrentTime in nsDOMMediaStream.h r=cpearce
content/media/nsDOMMediaStream.h
--- a/content/media/nsDOMMediaStream.h
+++ b/content/media/nsDOMMediaStream.h
@@ -6,16 +6,23 @@
 #ifndef NSDOMMEDIASTREAM_H_
 #define NSDOMMEDIASTREAM_H_
 
 #include "nsIDOMMediaStream.h"
 #include "MediaStreamGraph.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIPrincipal.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
+
 /**
  * DOM wrapper for MediaStreams.
  */
 class nsDOMMediaStream : public nsIDOMMediaStream
 {
   typedef mozilla::MediaStream MediaStream;
 
 public: