Bug 1208371 - Move GetCurrentTime undef to DOMMediaStream.cpp. r=jesup

Not sure why this surfaced now. Include ordering must have changed.

MozReview-Commit-ID: 43eGMdVoycw

--HG--
extra : rebase_source : 5013c1bb93060ea593bca96fe84f3418ea1aefa3

dom/media/DOMMediaStream.cpp

@@ -35,6 +35,12 @@
 #undef LOG
 #endif
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with MediaStream::GetCurrentTime.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;

dom/media/DOMMediaStream.h

@@ -16,12 +16,6 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "PrincipalChangeObserver.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
 // X11 has a #define for CurrentTime. Unbelievable :-(.
 // See dom/media/webaudio/AudioContext.h for more fun!
 #ifdef CurrentTime