summaryrefslogtreecommitdiff
path: root/core/src/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
commit19922bbc0d62b81e0fdd6a01da39e9b875c53c68 (patch)
treea5976a2c761d4eb6478582f7a65640ca021343a9 /core/src/fxcrt
parent18e5b4b41dc622d4601be538934272678beb7069 (diff)
downloadpdfium-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/src/fxcrt')
-rw-r--r--core/src/fxcrt/extension.h7
-rw-r--r--core/src/fxcrt/fx_arabic.h8
-rw-r--r--core/src/fxcrt/fx_safe_types.h6
-rw-r--r--core/src/fxcrt/fxcrt_platforms.h9
-rw-r--r--core/src/fxcrt/fxcrt_posix.h9
-rw-r--r--core/src/fxcrt/fxcrt_windows.h9
-rw-r--r--core/src/fxcrt/plex.h4
-rw-r--r--core/src/fxcrt/xml_int.h8
8 files changed, 39 insertions, 21 deletions
diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h
index 115b15b674..8d02e329ad 100644
--- a/core/src/fxcrt/extension.h
+++ b/core/src/fxcrt/extension.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_EXTENSION_IMP_
-#define _FXCRT_EXTENSION_IMP_
+#ifndef CORE_SRC_FXCRT_EXTENSION_H_
+#define CORE_SRC_FXCRT_EXTENSION_H_
#include "fx_safe_types.h"
@@ -474,4 +474,5 @@ FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, FX_INT32 iCount);
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif // CORE_SRC_FXCRT_EXTENSION_H_
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index eb05801849..cf221301f2 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_ARABIC_IMP
-#define _FX_ARABIC_IMP
+#ifndef CORE_SRC_FXCRT_FX_ARABIC_H_
+#define CORE_SRC_FXCRT_FX_ARABIC_H_
+
typedef struct _FX_ARABICCHARRANGE {
FX_WCHAR wStart;
FX_WCHAR wEnd;
@@ -206,4 +207,5 @@ private:
FX_INT32 m_iLastStart;
FX_INT32 m_iLastCount;
};
-#endif
+
+#endif // CORE_SRC_FXCRT_FX_ARABIC_H_
diff --git a/core/src/fxcrt/fx_safe_types.h b/core/src/fxcrt/fx_safe_types.h
index 5772fd0e3c..35a906cf27 100644
--- a/core/src/fxcrt/fx_safe_types.h
+++ b/core/src/fxcrt/fx_safe_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FX_SAFE_TYPES_H_
-#define FX_SAFE_TYPES_H_
+#ifndef CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
+#define CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
#include <stdlib.h> // For size_t.
@@ -14,4 +14,4 @@ typedef pdfium::base::CheckedNumeric<FX_INT32> FX_SAFE_INT32;
typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T;
typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE;
-#endif // FX_SAFE_TYPES_H_
+#endif // CORE_SRC_FXCRT_FX_SAFE_TYPES_H_
diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h
index dbfa58be1a..be51724352 100644
--- a/core/src/fxcrt/fxcrt_platforms.h
+++ b/core/src/fxcrt/fxcrt_platforms.h
@@ -4,9 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_PLATFORMS_
-#define _FXCRT_PLATFORMS_
+#ifndef CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+#define CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
+
#include "extension.h"
+
#if _FX_OS_ == _FX_ANDROID_
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode);
void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode);
@@ -32,4 +34,5 @@ protected:
FXSYS_FILE* m_hFile;
};
#endif
-#endif
+
+#endif // CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_
diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h
index 89162cd037..8c716cd6d6 100644
--- a/core/src/fxcrt/fxcrt_posix.h
+++ b/core/src/fxcrt/fxcrt_posix.h
@@ -4,9 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_LINUX_
-#define _FXCRT_LINUX_
+#ifndef CORE_SRC_FXCRT_FXCRT_POSIX_H_
+#define CORE_SRC_FXCRT_FXCRT_POSIX_H_
+
#include "extension.h"
+
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess
{
@@ -30,4 +32,5 @@ protected:
FX_INT32 m_nFD;
};
#endif
-#endif
+
+#endif // CORE_SRC_FXCRT_FXCRT_POSIX_H_
diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h
index 92646b2757..1919f3e4d7 100644
--- a/core/src/fxcrt/fxcrt_windows.h
+++ b/core/src/fxcrt/fxcrt_windows.h
@@ -4,9 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_WINDOWS_
-#define _FXCRT_WINDOWS_
+#ifndef CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+#define CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
+
#include "extension.h"
+
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess
{
@@ -30,4 +32,5 @@ protected:
FX_LPVOID m_hFile;
};
#endif
-#endif
+
+#endif // CORE_SRC_FXCRT_FXCRT_WINDOWS_H_
diff --git a/core/src/fxcrt/plex.h b/core/src/fxcrt/plex.h
index f8f01948e5..a4ac4f7c48 100644
--- a/core/src/fxcrt/plex.h
+++ b/core/src/fxcrt/plex.h
@@ -3,6 +3,8 @@
// found in the LICENSE file.
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#ifndef CORE_SRC_FXCRT_PLEX_H_
+#define CORE_SRC_FXCRT_PLEX_H_
struct CFX_Plex {
CFX_Plex* pNext;
@@ -13,3 +15,5 @@ struct CFX_Plex {
static CFX_Plex* Create(CFX_Plex*& head, FX_DWORD nMax, FX_DWORD cbElement);
void FreeDataChain();
};
+
+#endif // CORE_SRC_FXCRT_PLEX_H_
diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h
index f0a2485163..7cfeec95f7 100644
--- a/core/src/fxcrt/xml_int.h
+++ b/core/src/fxcrt/xml_int.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_XML_INT_
-#define _FXCRT_XML_INT_
+#ifndef CORE_SRC_FXCRT_XML_INT_H_
+#define CORE_SRC_FXCRT_XML_INT_H_
+
class CXML_DataBufAcc : public IFX_BufferRead
{
public:
@@ -158,4 +159,5 @@ public:
void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
};
void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName);
-#endif
+
+#endif // CORE_SRC_FXCRT_XML_INT_H_