зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1275541
- Undefine GetCurrentTime. r=padenot, r=jesup
MozReview-Commit-ID: 3LSadqoMKD3 --HG-- extra : rebase_source : 514892577c08251de1c2be0a7e3ca110497370d4
This commit is contained in:
Родитель
15b5bd2baf
Коммит
6c95ab3e8e
|
@ -520,6 +520,13 @@ struct TrackBound
|
|||
* 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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче