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 /fpdfsdk/include/fxedit | |
| 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 'fpdfsdk/include/fxedit')
| -rw-r--r-- | fpdfsdk/include/fxedit/fx_edit.h | 7 | ||||
| -rw-r--r-- | fpdfsdk/include/fxedit/fxet_edit.h | 7 | ||||
| -rw-r--r-- | fpdfsdk/include/fxedit/fxet_list.h | 6 | ||||
| -rw-r--r-- | fpdfsdk/include/fxedit/fxet_stub.h | 26 |
4 files changed, 17 insertions, 29 deletions
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index bf00995ea9..31ede0564b 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_EDIT_H_ -#define _FX_EDIT_H_ +#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ +#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ #include "../../../core/include/fxcrt/fx_basic.h" #include "../../../core/include/fxge/fx_dib.h" @@ -492,5 +492,4 @@ protected: ~IFX_List() { } }; -#endif - +#endif // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h index 9e5c40f5ff..237aa66b53 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/include/fxedit/fxet_edit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXET_EDIT_H_ -#define _FXET_EDIT_H_ +#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ +#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ #include "../../../core/include/fpdfdoc/fpdf_vt.h" #include "fx_edit.h" @@ -814,5 +814,4 @@ private: IFX_Edit_FontMap* m_pFontMap; }; -#endif //_FXET_EDIT_H_ - +#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_ diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h index 6b634ffeec..5c689ed439 100644 --- a/fpdfsdk/include/fxedit/fxet_list.h +++ b/fpdfsdk/include/fxedit/fxet_list.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXET_LIST_H_ -#define _FXET_LIST_H_ +#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ +#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ #include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. #include "fx_edit.h" @@ -360,4 +360,4 @@ private: FX_INT32 m_nCaretIndex; //for multiple }; -#endif +#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h index a1aa2e25ca..8fe2f0cd95 100644 --- a/fpdfsdk/include/fxedit/fxet_stub.h +++ b/fpdfsdk/include/fxedit/fxet_stub.h @@ -1,26 +1,16 @@ // Copyright 2014 PDFium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - + // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXET_STUB_H_ -#define _FXET_STUB_H_ +#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ +#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ -#include "../../../core/include/fpdfapi/fpdf_module.h" -#include "../../../core/include/fpdfapi/fpdf_render.h" -#include "../../../core/include/fpdfapi/fpdf_pageobj.h" -#include "../../../core/include/fpdfdoc/fpdf_vt.h" +#include "../../../core/include/fpdfapi/fpdf_module.h" +#include "../../../core/include/fpdfapi/fpdf_render.h" +#include "../../../core/include/fpdfapi/fpdf_pageobj.h" +#include "../../../core/include/fpdfdoc/fpdf_vt.h" #include "../fx_systemhandler.h" -#ifdef FX_READER_DLL - #ifdef _DEBUG - #pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fxcoredll[dbg,w32,vc6].lib") - #pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fpdfdocdll[dbg,w32,vc6].lib") - #else - #pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fxcoredll[rel,w32,vc6].lib") - #pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fpdfdocdll[rel,w32,vc6].lib") - #endif -#endif - -#endif +#endif // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ |