1# HG changeset patch 2# User Bruce Sun <brsun@mozilla.com> 3# Date 1498781240 25200 4# Thu Jun 29 17:07:20 2017 -0700 5# Node ID 20556f24d36ccfb4471b9ef86241a6f8912e8a19 6# Parent 5c522cd3d85e88d3cd7415c917985af687a8a0a6 7Bug 1368948: Undefine WIN32_LEAN_AND_MEAN when building PDFium to avoid build errors in GDI+ headers. 8 9Mozilla build system includes mozilla-config.h, which defines WIN32_LEAN_AND_MEAN. 10Some definitions are stripped from header files by WIN32_LEAN_AND_MEAN causing build 11errors in GDI+ headers. Including objidl.h would fix these errors, but since Chromium 12builds PDFium without WIN32_LEAN_AND_MEAN, we do the same. 13 14MozReview-Commit-ID: HQYrtJgQXHP 15 16diff --git a/modules/pdfium/pdfium/core/fxge/win32/fx_win32_gdipext.cpp b/modules/pdfium/pdfium/core/fxge/win32/fx_win32_gdipext.cpp 17--- a/modules/pdfium/pdfium/core/fxge/win32/fx_win32_gdipext.cpp 18+++ b/modules/pdfium/pdfium/core/fxge/win32/fx_win32_gdipext.cpp 19@@ -1,14 +1,15 @@ 20 // Copyright 2014 PDFium Authors. All rights reserved. 21 // Use of this source code is governed by a BSD-style license that can be 22 // found in the LICENSE file. 23 24 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 25 26+#undef WIN32_LEAN_AND_MEAN 27 #include <windows.h> 28 29 #include <algorithm> 30 #include <memory> 31 32 #include "core/fxcrt/fx_system.h" 33 #include "core/fxge/cfx_gemodule.h" 34 #include "core/fxge/cfx_graphstatedata.h" 35