Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1402065 Remove __in and __out from our in-tree copy of pdfium r=jwatt

Browse Source 
These macros are not used by anything other than Microsoft static analysis
tools, but they break the MinGW compile. MinGW cannot define these macros
in C++ code, because they conflict with libstdc++ arguement names.

See Line 222 of cef0747077/tree/mingw-w64-headers/include/sal.h

MozReview-Commit-ID: J6LZpy6F3h4

--HG--
extra : rebase_source : cfef43bfe66671acfa8f9014f2845c8c954b0f03
This commit is contained in:
Tom Ritter 2017-09-21 13:43:56 -05:00
parent 6c9882ed08
commit 1ccfc37292
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/pdfium/pdfium/core/fxge/win32/fx_win32_dwrite.cpp
View File

@ -11,9 +11,9 @@
#include "core/fxge/win32/dwrite_int.h"
typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
__in DWRITE_FACTORY_TYPE,
__in REFIID,
__out IUnknown**);
DWRITE_FACTORY_TYPE,
REFIID,
IUnknown**);
template <typename InterfaceType>
inline void SafeRelease(InterfaceType** currentObject) {
if (*currentObject) {
@ -114,7 +114,7 @@ class CDwGdiTextRenderer {
FLOAT baselineOriginX,
FLOAT baselineOriginY,
DWRITE_MEASURING_MODE measuringMode,
__in DWRITE_GLYPH_RUN const* glyphRun,
DWRITE_GLYPH_RUN const* glyphRun,
const COLORREF& textColor);
private:
@ -413,7 +413,7 @@ STDMETHODIMP CDwGdiTextRenderer::DrawGlyphRun(
FLOAT baselineOriginX,
FLOAT baselineOriginY,
DWRITE_MEASURING_MODE measuringMode,
__in DWRITE_GLYPH_RUN const* glyphRun,
DWRITE_GLYPH_RUN const* glyphRun,
const COLORREF& textColor) {
HRESULT hr = S_OK;
if (pMatrix) {