From c9347083c8b813454e971ce9e648cf7d8b25d60b Mon Sep 17 00:00:00 2001 From: thestig Date: Mon, 3 Oct 2016 06:14:50 -0700 Subject: Remove _FX_OS_ checks in core/fxge/win32/. All the files are already excluded by the build system. Review-Url: https://codereview.chromium.org/2387863002 --- core/fxge/win32/fx_win32_gdipext.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'core/fxge/win32/fx_win32_gdipext.cpp') diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index d3135a249c..2d19808517 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -4,25 +4,25 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fxcrt/fx_system.h" - -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include -#include - -namespace Gdiplus { -using std::min; -using std::max; -} // namespace Gdiplus -#include +#include +#include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/win32/cfx_windowsdib.h" #include "core/fxge/win32/win32_int.h" +// Has to come before gdiplus.h +namespace Gdiplus { +using std::min; +using std::max; +} // namespace Gdiplus + +#include // NOLINT + using namespace Gdiplus; // NOLINT using namespace Gdiplus::DllExports; // NOLINT @@ -1524,4 +1524,3 @@ CFX_DIBitmap* CGdiplusExt::LoadDIBitmap(WINDIB_Open_Args_ args) { FreeDIBitmap(pInfo); return pDIBitmap; } -#endif -- cgit v1.2.3