diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-28 13:23:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-28 13:23:12 -0700 |
| commit | 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 (patch) | |
| tree | a5976a2c761d4eb6478582f7a65640ca021343a9 /core/include/fxcodec | |
| parent | 18e5b4b41dc622d4601be538934272678beb7069 (diff) | |
| download | pdfium-19922bbc0d62b81e0fdd6a01da39e9b875c53c68.tar.xz | |
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
Diffstat (limited to 'core/include/fxcodec')
| -rw-r--r-- | core/include/fxcodec/fx_codec.h | 11 | ||||
| -rw-r--r-- | core/include/fxcodec/fx_codec_def.h | 8 | ||||
| -rw-r--r-- | core/include/fxcodec/fx_codec_provider.h | 8 |
3 files changed, 16 insertions, 11 deletions
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 3a00fd3835..6a62c2d12c 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_CODEC_H_ -#define _FX_CODEC_H_ -#ifndef _FXCRT_EXTENSION_ +#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_ +#define CORE_INCLUDE_FXCODEC_FX_CODEC_H_ + #include "../fxcrt/fx_ext.h" -#endif #include "fx_codec_def.h" #include "fx_codec_provider.h" + class CFX_DIBSource; class ICodec_ScanlineDecoder; class ICodec_ProgressiveDecoder;
@@ -468,4 +468,5 @@ public: virtual ~IFX_DIBAttributeExif() {};
virtual FX_BOOL GetInfo(FX_WORD tag, FX_LPVOID val) = 0;
};
-#endif + +#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_H_ diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h index 7a18f5be09..a98c61a4c5 100644 --- a/core/include/fxcodec/fx_codec_def.h +++ b/core/include/fxcodec/fx_codec_def.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_CODEC_DEF_H_ -#define _FX_CODEC_DEF_H_ +#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ +#define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ + enum FXCODEC_IMAGE_TYPE { FXCODEC_IMAGE_UNKNOWN = 0, FXCODEC_IMAGE_BMP, @@ -83,4 +84,5 @@ enum FXCODEC_RESUNIT { #define EXIFTAG_STRING_IAMGEDESCRIPTION 270 #define EXIFTAG_STRING_DATETIME 306 #define EXIFTAG_STRING_COPYRIGHT 33432 -#endif + +#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ diff --git a/core/include/fxcodec/fx_codec_provider.h b/core/include/fxcodec/fx_codec_provider.h index 00792ff2ad..8d2b4980ec 100644 --- a/core/include/fxcodec/fx_codec_provider.h +++ b/core/include/fxcodec/fx_codec_provider.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_CODEC_PROVIDER_H_ -#define _FX_CODEC_PROVIDER_H_ +#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_ +#define CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_ + class CFX_DIBAttribute; class IFX_JpegProvider { @@ -52,4 +53,5 @@ public: protected: ~IFX_JpegProvider() { } }; -#endif + +#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_ |