summaryrefslogtreecommitdiff
path: root/core/fxcrt/fx_system.h
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-09-27 11:07:51 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-27 16:18:11 +0000
commit8b1408e7053247def45659515cda19a64a7fccd5 (patch)
treef3dfb5ebd24fb4993c6b915917b97250b3739555 /core/fxcrt/fx_system.h
parentbacf75eeeb5d89fe60b2c77584350ca1b1432bd5 (diff)
downloadpdfium-8b1408e7053247def45659515cda19a64a7fccd5.tar.xz
Remove FXSYS_strlen and FXSYS_wcslenchromium/3226
With the conversion of internal string sizes to size_t, these wrappers are no longer needed. Replacing them with strlen and wcslen respectively. BUG=pdfium:828 Change-Id: Ia087ca2ddaf688a57ec9bd9ddfb8533cbe41510d Reviewed-on: https://pdfium-review.googlesource.com/14890 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/fx_system.h')
-rw-r--r--core/fxcrt/fx_system.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h
index 2c84b02238..aa9b8490f9 100644
--- a/core/fxcrt/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -116,16 +116,13 @@ extern "C" {
#include "third_party/base/numerics/safe_conversions.h"
-#define FXSYS_strlen(ptr) (strlen(ptr))
-#define FXSYS_wcslen(ptr) (wcslen(ptr))
-
// Overloaded functions for C++ templates
inline size_t FXSYS_len(const char* ptr) {
- return FXSYS_strlen(ptr);
+ return strlen(ptr);
}
inline size_t FXSYS_len(const wchar_t* ptr) {
- return FXSYS_wcslen(ptr);
+ return wcslen(ptr);
}
inline int FXSYS_cmp(const char* ptr1, const char* ptr2, size_t len) {
@@ -145,9 +142,6 @@ inline const wchar_t* FXSYS_chr(const wchar_t* ptr, wchar_t ch, size_t len) {
}
extern "C" {
-#else
-#define FXSYS_strlen(ptr) (strlen(ptr))
-#define FXSYS_wcslen(ptr) (wcslen(ptr))
#endif // __cplusplus
#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_