From 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 28 May 2015 13:23:12 -0700 Subject: Merge to XFA: Fix ALL the include guards. Original Review URL: https://codereview.chromium.org/1160443004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1162013003 --- core/src/fxge/win32/dwrite_int.h | 8 +++++--- core/src/fxge/win32/win32_int.h | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'core/src/fxge/win32') diff --git a/core/src/fxge/win32/dwrite_int.h b/core/src/fxge/win32/dwrite_int.h index 2eecc7c76b..d95f115fbc 100644 --- a/core/src/fxge/win32/dwrite_int.h +++ b/core/src/fxge/win32/dwrite_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_DIRECT_WRITE_ -#define _FX_DIRECT_WRITE_ +#ifndef CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ +#define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ + #ifndef DECLSPEC_UUID #if (_MSC_VER >= 1100) && defined (__cplusplus) #define DECLSPEC_UUID(x) __declspec(uuid(x)) @@ -56,4 +57,5 @@ protected: void* m_pDwFontContext; void* m_pDwTextRenderer; }; -#endif + +#endif // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index bc3eb878d9..7c5c0720b1 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -3,6 +3,8 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXGE_WIN32_WIN32_INT_H_ +#define CORE_SRC_FXGE_WIN32_WIN32_INT_H_ struct WINDIB_Open_Args_; class CGdiplusExt @@ -236,3 +238,5 @@ protected: CFX_PSRenderer m_PSRenderer; }; void _Color2Argb(FX_ARGB& argb, FX_DWORD color, int alpha_flag, void* pIccTransform); + +#endif // CORE_SRC_FXGE_WIN32_WIN32_INT_H_ -- cgit v1.2.3