summaryrefslogtreecommitdiff
path: root/core/include/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-28 13:09:35 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-28 13:09:35 -0700
commit6b776fed401f97ce2589a847465280de704b9d7f (patch)
tree39f484bd9b3282cbd7e5dbd48c784534e29b59c3 /core/include/fxcrt
parent14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (diff)
downloadpdfium-6b776fed401f97ce2589a847465280de704b9d7f.tar.xz
Fix ALL the include guards.
Get rid of leading _CAPITAL identifiers. A large number of these didn't actually match the filename. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1160443004
Diffstat (limited to 'core/include/fxcrt')
-rw-r--r--core/include/fxcrt/fx_arb.h7
-rw-r--r--core/include/fxcrt/fx_basic.h6
-rw-r--r--core/include/fxcrt/fx_coordinates.h7
-rw-r--r--core/include/fxcrt/fx_ext.h7
-rw-r--r--core/include/fxcrt/fx_memory.h9
-rw-r--r--core/include/fxcrt/fx_stream.h7
-rw-r--r--core/include/fxcrt/fx_string.h7
-rw-r--r--core/include/fxcrt/fx_system.h6
-rw-r--r--core/include/fxcrt/fx_ucd.h7
-rw-r--r--core/include/fxcrt/fx_xml.h7
10 files changed, 39 insertions, 31 deletions
diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h
index f173ee7f1f..ff86fa6cf7 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"
@@ -23,4 +23,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 f258029a11..0a5d4907b1 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"
@@ -1610,4 +1610,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 3db772a08e..3d0cdedf9e 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"
@@ -90,4 +90,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 a75ff25818..c6a7d486f1 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"
@@ -115,5 +115,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 73bb8a72fe..7f36342160 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"
@@ -200,4 +200,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 <stdint.h> // For intptr_t.
#include <algorithm>
@@ -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 abf953d68a..e764d9fd97 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_system.h"
@@ -98,4 +98,5 @@ FX_BOOL FX_IsCombinationChar(FX_WCHAR wch);
FX_BOOL FX_IsBidiChar(FX_WCHAR wch);
FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical);
FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_DWORD dwProps, FX_BOOL bRTL, FX_BOOL bVertical);
-#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_