From b5b62d841c733dcb62112f3158f1488e670671d6 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 22 Apr 2020 02:32:20 +0000 Subject: Issue #80 - De-unify dom/media part 1 This de-unifies up to and including dom/media/platforms with the exception of dom/media/platforms/wmf, because that one throws weird errors in the Win SDK which don't have a clear cause (yet) --- dom/media/MediaDecoder.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dom/media/MediaDecoder.cpp') diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp index 0cce91ccb..b1f2f95d7 100644 --- a/dom/media/MediaDecoder.cpp +++ b/dom/media/MediaDecoder.cpp @@ -788,6 +788,13 @@ MediaDecoder::CallSeek(const SeekTarget& aTarget, dom::Promise* aPromise) &MediaDecoder::OnSeekResolved, &MediaDecoder::OnSeekRejected)); } +// GetCurrentTime is defined in winbase.h as a zero argument macro forwarding to +// GetTickCount(), which conflicts with the MediaDecoder::GetCurrentTime +// implementation here. Clear the macro. +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + double MediaDecoder::GetCurrentTime() { -- cgit v1.2.3