summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_ext.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-06 12:28:23 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-06 12:28:23 -0700
commit6fcecb529007b65596f0ce30efde571f820df56b (patch)
tree2e88339638d1cdb974c24638388fb0c5ec613182 /core/include/fxcrt/fx_ext.h
parent9bf1f76771e04c20cb8a0f1c3d1938bdb965882e (diff)
downloadpdfium-6fcecb529007b65596f0ce30efde571f820df56b.tar.xz
Fix IWYU in fxcrt headers.
Confirmed manually that: g++ --std=c++0x -o /dev/null -I. ... -c fx_xxxxx.h is now error-free for the files in this directory. Also kill some ifndef's around inclusion since we know this doesn't provide benefit with modern compilers. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1064433005
Diffstat (limited to 'core/include/fxcrt/fx_ext.h')
-rw-r--r--core/include/fxcrt/fx_ext.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 03ec488135..3db772a08e 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -6,26 +6,17 @@
#ifndef _FXCRT_EXTENSION_
#define _FXCRT_EXTENSION_
-#ifndef _FX_BASIC_H_
+
+#include "fx_arb.h"
#include "fx_basic.h"
-#endif
-#ifndef _FXCRT_COORDINATES_
#include "fx_coordinates.h"
-#endif
-#ifndef _FX_XML_H_
-#include "fx_xml.h"
-#endif
-#ifndef _FX_UNICODE_
#include "fx_ucd.h"
-#endif
-#ifndef _FX_ARABIC_
-#include "fx_arb.h"
-#endif
+#include "fx_xml.h"
+
#ifdef __cplusplus
extern "C" {
#endif
-
FX_FLOAT FXSYS_tan(FX_FLOAT a);
FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x);
FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr, FX_INT32 iLength = -1, FX_INT32 *pUsedLen = NULL);
@@ -33,6 +24,7 @@ FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr, FX_INT32 iLength = -1, FX_INT32 *pUsed
FX_LPWSTR FXSYS_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count);
FX_INT32 FXSYS_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count);
FX_INT32 FXSYS_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count);
+
inline FX_BOOL FXSYS_islower(FX_INT32 ch)
{
return ch >= 'a' && ch <= 'z';
@@ -50,8 +42,6 @@ inline FX_INT32 FXSYS_toupper(FX_INT32 ch)
return ch < 'a' || ch > 'z' ? ch : (ch - 0x20);
}
-
-
FX_DWORD FX_HashCode_String_GetA(FX_LPCSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase = FALSE);
FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase = FALSE);