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/include/fxcrt/fx_arb.h | 7 ++++--- core/include/fxcrt/fx_basic.h | 6 +++--- core/include/fxcrt/fx_coordinates.h | 7 ++++--- core/include/fxcrt/fx_ext.h | 7 ++++--- core/include/fxcrt/fx_memory.h | 9 +++++---- core/include/fxcrt/fx_stream.h | 7 ++++--- core/include/fxcrt/fx_string.h | 7 ++++--- core/include/fxcrt/fx_system.h | 6 +++--- core/include/fxcrt/fx_ucd.h | 7 ++++--- core/include/fxcrt/fx_xml.h | 7 ++++--- 10 files changed, 39 insertions(+), 31 deletions(-) (limited to 'core/include/fxcrt') diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h index e61c0cc456..8c2a8eba42 100644 --- a/core/include/fxcrt/fx_arb.h +++ b/core/include/fxcrt/fx_arb.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_ARABIC_ -#define _FX_ARABIC_ +#ifndef CORE_INCLUDE_FXCRT_FX_ARB_H_ +#define CORE_INCLUDE_FXCRT_FX_ARB_H_ #include "fx_system.h" #include "fx_ucd.h" @@ -72,4 +72,5 @@ public: protected: ~IFX_BidiChar() { } }; -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_ARB_H_ diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 7c25b237ad..111e0d3876 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_BASIC_H_ -#define _FX_BASIC_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_ +#define CORE_INCLUDE_FXCRT_FX_BASIC_H_ #include "fx_memory.h" #include "fx_stream.h" @@ -1626,4 +1626,4 @@ public: FX_FLOAT i; }; -#endif +#endif // CORE_INCLUDE_FXCRT_FX_BASIC_H_ diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h index 758d33762e..076c0e6a2f 100644 --- a/core/include/fxcrt/fx_coordinates.h +++ b/core/include/fxcrt/fx_coordinates.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_COORDINATES_ -#define _FXCRT_COORDINATES_ +#ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ +#define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ #include "fx_basic.h" @@ -903,4 +903,5 @@ public: FX_FLOAT f; }; #define CFX_AffineMatrix CFX_Matrix -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h index c9c4447be3..97c47df6f6 100644 --- a/core/include/fxcrt/fx_ext.h +++ b/core/include/fxcrt/fx_ext.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_EXTENSION_ -#define _FXCRT_EXTENSION_ +#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_ +#define CORE_INCLUDE_FXCRT_FX_EXT_H_ #include "fx_arb.h" #include "fx_basic.h" @@ -108,4 +108,5 @@ public: } } }; -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_EXT_H_ diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index e4b6e98039..03df3647b0 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_MEMORY_H_ -#define _FX_MEMORY_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_MEMORY_H_ +#define CORE_INCLUDE_FXCRT_FX_MEMORY_H_ #include "fx_system.h" @@ -117,5 +117,6 @@ private: void* m_pFirstTrunk; }; -#endif // __cplusplust -#endif // _FX_MEMORY_H_ +#endif // __cplusplus + +#endif // CORE_INCLUDE_FXCRT_FX_MEMORY_H_ diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index dc162f064f..35c54cb3d2 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_STREAM_H_ -#define _FX_STREAM_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_ +#define CORE_INCLUDE_FXCRT_FX_STREAM_H_ #include "fx_memory.h" #include "fx_string.h" @@ -209,4 +209,5 @@ public: virtual FX_FILESIZE GetBlockOffset() = 0; }; -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_STREAM_H_ diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 3614cbe0ee..efbe80accb 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_STRING_H_ -#define _FX_STRING_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_ +#define CORE_INCLUDE_FXCRT_FX_STRING_H_ #include // For intptr_t. #include @@ -902,4 +902,5 @@ inline CFX_ByteString FX_UTF8Encode(const CFX_WideString &wsStr) { return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength()); } -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_STRING_H_ diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 96030ca551..76c6b59a52 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_SYSTEM_H_ -#define _FX_SYSTEM_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ +#define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ #define _FX_WIN32_DESKTOP_ 1 #define _FX_LINUX_DESKTOP_ 4 @@ -359,4 +359,4 @@ int FXSYS_round(FX_FLOAT f); #define NEVER_INLINE __attribute__((__noinline__)) #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -#endif // _FX_SYSTEM_H_ +#endif // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h index 66e980e13c..42ab623afb 100644 --- a/core/include/fxcrt/fx_ucd.h +++ b/core/include/fxcrt/fx_ucd.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_UNICODE_ -#define _FX_UNICODE_ +#ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_ +#define CORE_INCLUDE_FXCRT_FX_UCD_H_ #include "fx_basic.h" @@ -197,4 +197,5 @@ public: IFX_Unknown *m_pUserData; }; typedef CFX_ArrayTemplate CFX_RTFCharArray; -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_UCD_H_ diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h index 7f3dbcc205..b2fb24c6df 100644 --- a/core/include/fxcrt/fx_xml.h +++ b/core/include/fxcrt/fx_xml.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_XML_H_ -#define _FX_XML_H_ +#ifndef CORE_INCLUDE_FXCRT_FX_XML_H_ +#define CORE_INCLUDE_FXCRT_FX_XML_H_ #include "fx_basic.h" @@ -176,4 +176,5 @@ protected: friend class CXML_Parser; friend class CXML_Composer; }; -#endif + +#endif // CORE_INCLUDE_FXCRT_FX_XML_H_ -- cgit v1.2.3