Bug 1209519 - Undef GetCurrentTime in DocumentTimeline.h to fix --disable-accessibility bustage. r=birtles
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 29 Sep 2015 10:04:30 -0400
changeset 265085 ce3c0f04de503847d4e6f144fbb474a020177b44
parent 265084 b308d1901a371aebb1ed2183d62b921f6b0d8ac1
child 265086 96db1aea13c6fd2e11c57d9236477baab6094de8
push id65837
push userryanvm@gmail.com
push dateWed, 30 Sep 2015 00:18:35 +0000
treeherdermozilla-inbound@ce3c0f04de50 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbirtles
bugs1209519
milestone44.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 1209519 - Undef GetCurrentTime in DocumentTimeline.h to fix --disable-accessibility bustage. r=birtles
dom/animation/DocumentTimeline.h
--- a/dom/animation/DocumentTimeline.h
+++ b/dom/animation/DocumentTimeline.h
@@ -9,16 +9,22 @@
 
 #include "mozilla/TimeStamp.h"
 #include "AnimationTimeline.h"
 #include "nsIDocument.h"
 #include "nsRefreshDriver.h"
 
 struct JSContext;
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount().
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 namespace mozilla {
 namespace dom {
 
 class DocumentTimeline final
   : public AnimationTimeline
   , public nsARefreshObserver
 {
 public: