diff options
author | thestig <thestig@chromium.org> | 2016-10-03 06:14:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-03 06:14:50 -0700 |
commit | c9347083c8b813454e971ce9e648cf7d8b25d60b (patch) | |
tree | 0b4e04aa82b94b20e6828fa60e23ddf84c7c7e09 /core/fxge/win32/fx_win32_gdipext.cpp | |
parent | 3a88205e8ddce125d78fb6961f7eac2470bbcd55 (diff) | |
download | pdfium-c9347083c8b813454e971ce9e648cf7d8b25d60b.tar.xz |
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
Diffstat (limited to 'core/fxge/win32/fx_win32_gdipext.cpp')
-rw-r--r-- | core/fxge/win32/fx_win32_gdipext.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
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 <windows.h> -#include <algorithm> - -namespace Gdiplus { -using std::min; -using std::max; -} // namespace Gdiplus -#include <gdiplus.h> +#include <algorithm> +#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 <gdiplus.h> // 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 |