diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 12:26:37 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 12:26:37 +0100 |
| commit | ee70e3a3661748efbf713e3469e3ee33feae3978 (patch) | |
| tree | b8ae4fcc1fc0e309f684289844133afd6deb6d8d /dom/media | |
| parent | 3d37f61816aafcb0ae817003a9f4822e81252d3a (diff) | |
| download | UXP-ee70e3a3661748efbf713e3469e3ee33feae3978.tar UXP-ee70e3a3661748efbf713e3469e3ee33feae3978.tar.gz UXP-ee70e3a3661748efbf713e3469e3ee33feae3978.tar.lz UXP-ee70e3a3661748efbf713e3469e3ee33feae3978.tar.xz UXP-ee70e3a3661748efbf713e3469e3ee33feae3978.zip | |
Remove always-false block from WMF.
Diffstat (limited to 'dom/media')
| -rw-r--r-- | dom/media/platforms/wmf/WMF.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/dom/media/platforms/wmf/WMF.h b/dom/media/platforms/wmf/WMF.h index 5ede0d361..6988ef083 100644 --- a/dom/media/platforms/wmf/WMF.h +++ b/dom/media/platforms/wmf/WMF.h @@ -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 |