Bug 1336778 - Part 1: Remove always-false #if WINVER < _WIN32_WINNT_WIN7 (0x0601) check in dom/media. r=cpearce

As of bug 1325299, WINVER is always >= 0x0601 (Windows 7).

MozReview-Commit-ID: BJYg9d3zuYx

--HG--
extra : source : 4eff752dd001a722fe1d8e60e56ccb5f70c8d872
This commit is contained in:
Chris Peterson 2017-01-25 00:13:33 -08:00
Родитель 613197451b
Коммит 1db7fcec65
1 изменённых файлов: 1 добавлений и 17 удалений

Просмотреть файл

@ -7,18 +7,6 @@
#ifndef WMF_H_
#define WMF_H_
#if WINVER < _WIN32_WINNT_WIN7
#error \
You must include WMF.h before including mozilla headers, \
otherwise mozconfig.h will be included \
and that sets WINVER to WinXP, \
which makes Windows Media Foundation unavailable.
#endif
#pragma push_macro("WINVER")
#undef WINVER
#define WINVER _WIN32_WINNT_WIN7
#include <windows.h>
#include <mfapi.h>
#include <mfidl.h>
@ -35,7 +23,7 @@ which makes Windows Media Foundation unavailable.
#include <codecapi.h>
// The Windows headers helpfully declare min and max macros, which don't
// compile in the prescence of std::min and std::max and unified builds.
// compile in the presence of std::min and std::max and unified builds.
// So undef them here.
#ifdef min
#undef min
@ -97,8 +85,4 @@ HRESULT MFCreateDXGISurfaceBuffer(REFIID riid,
} // end namespace wmf
} // end namespace mozilla
#pragma pop_macro("WINVER")
#endif